completions: add smerge (Sublime Merge CLI tool) #10135
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| complete -c smerge -l safe-mode -d 'Launch in a sandboxed environment' | ||
| complete -c smerge -s h -l help -d 'Show help (this message) and exit' | ||
| complete -c smerge -s v -l version -d 'Show version and exit' | ||
| complete -c smerge -a search -x -d 'Search for commits in the current repository' |
There was a problem hiding this comment.
What about suggesting commits like here?
There was a problem hiding this comment.
I don't think that would be useful. The expected argument to search is a query string; the subcommand launches Sublime Merge with its argument pre-filled into the commit message search field, which doesn't search commit hashes.
|
Thanks! |
shouya
pushed a commit
to shouya/fish-shell
that referenced
this pull request
Dec 29, 2023
* completions: add smerge (Sublime Merge CLI tool) * completions: add `-o` (and file completion) to `smerge mergetool`
zanchey
pushed a commit
that referenced
this pull request
Dec 31, 2023
* completions: add smerge (Sublime Merge CLI tool) * completions: add `-o` (and file completion) to `smerge mergetool` (cherry picked from commit b7a85fe)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds completions for
smerge, Sublime Merge's CLI.TODOs: