From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 10 Apr 2013 09:08:18 +0000 (-0500)
Subject: completion: add more cherry-pick options
X-Git-Tag: v1.8.3-rc0~59^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7655fa7fa9f58503f21e2354f4a12fd949efa712;p=git

completion: add more cherry-pick options

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2ba1461422..8ad842e462 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1124,9 +1124,14 @@ _git_cherry ()
 
 _git_cherry_pick ()
 {
+	local dir="$(__gitdir)"
+	if [ -f "$dir"/CHERRY_PICK_HEAD ]; then
+		__gitcomp "--continue --quit --abort"
+		return
+	fi
 	case "$cur" in
 	--*)
-		__gitcomp "--edit --no-commit"
+		__gitcomp "--edit --no-commit --signoff --strategy= --mainline"
 		;;
 	*)
 		__gitcomp_nl "$(__git_refs)"