Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-25 20:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add completions for git checkout --ours/--theirs (#4380)

Browse source 
* Add completions for git checkout --ours/--theirs

* Change description for `git checkout --ours/--theirs´ completions
This commit is contained in:
Moritz 2017-09-07 16:24:05 +02:00 committed by Fabian Homborg
parent c2f0a45d60
commit 6145b4a770
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
share/completions/git.fish
View file

@ -369,6 +369,8 @@ complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_tags)'
complete -f -c git -n '__fish_git_using_command checkout' -a '(__fish_git_modified_files)' --description 'File'
complete -f -c git -n '__fish_git_using_command checkout' -s b -d 'Create a new branch'
complete -f -c git -n '__fish_git_using_command checkout' -s t -l track -d 'Track a new branch'
complete -f -c git -n '__fish_git_using_command checkout' -l theirs -d 'Keep staged changes'
complete -f -c git -n '__fish_git_using_command checkout' -l ours -d 'Keep unmerged changes'
# TODO options
### apply