aboutsummaryrefslogtreecommitdiffhomepage
path: root/share/completions/git.fish
diff options
context:
space:
mode:
authorGravatar mr.Shu <mr@shu.io>2015-12-08 23:51:29 +0100
committerGravatar mr.Shu <mr@shu.io>2015-12-08 23:51:29 +0100
commita8837f537f9e647f5c36e2cc26fa650079298225 (patch)
tree5064461ff6f7dff225e50929ba3db76301d24ad9 /share/completions/git.fish
parentef67fc7ba05ab2c9b8e6b5240ce4f9da92ca79b8 (diff)
git: Add more options to `git cherry-pick`
* Add more options to `git cherry-pick` so that the suggested options mimic the man page (https://www.git-scm.com/docs/git-cherry-pick/). Signed-off-by: mr.Shu <mr@shu.io>
Diffstat (limited to 'share/completions/git.fish')
-rw-r--r--share/completions/git.fish6
1 files changed, 5 insertions, 1 deletions
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 402722ff..42d37d27 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -284,7 +284,11 @@ complete -f -c git -n '__fish_git_using_command branch' -l no-merged -d 'List br
complete -f -c git -n '__fish_git_needs_command' -a cherry-pick -d 'Apply the change introduced by an existing commit'
complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_branches)' -d 'Branch'
complete -f -c git -n '__fish_git_using_command cherry-pick' -a '(__fish_git_unique_remote_branches)' -d 'Remote branch'
-# TODO options
+complete -f -c git -n '__fish_git_using_command cherry-pick' -s e -l edit -d 'Edit the commit message prior to committing'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -s x -d 'Append info in generated commit on the origin of the cherry-picked change'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -s n -l no-commit -d 'Apply changes without making any commit'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -s s -l signoff -d 'Add Signed-off-by line to the commit message'
+complete -f -c git -n '__fish_git_using_command cherry-pick' -l ff -d 'Fast-forward if possible'
### clone
complete -f -c git -n '__fish_git_needs_command' -a clone -d 'Clone a repository into a new directory'