completion: add more cherry-pick options
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 10, 2013 at 04:08 UTC
7655fa7fa9f58503f21e2354f4a12fd949efa712
1 file changed
+6
-1
contrib/completion/git-completion.bash
+6
-1
@@ -1124,9 +1124,14 @@ _git_cherry ()
1124
1125
_git_cherry_pick ()
1126
{
1127
+ local dir="$(__gitdir)"
1128
+ if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
1129
+ __gitcomp "--continue --quit --abort"
1130
+ return
1131
+ fi
1132
case "$cur" in
1133
--*)
1129
- __gitcomp "--edit --no-commit"
1134
+ __gitcomp "--edit --no-commit --signoff --strategy= --mainline"
1135
;;
1136
*)
1137
__gitcomp_nl "$(__git_refs)"