bash: support 'git am's new '--continue' option

szeder · gitster · commit 85f6b439f2d6 · 2010-02-12T09:08:17.000-08:00
Signed-off-by: SZEDER Gábor &lt;szeder@ira.uka.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -667,7 +667,7 @@ _git_am ()
 {
 	local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
 	if [ -d "$dir"/rebase-apply ]; then
-		__gitcomp "--skip --resolved --abort"
+		__gitcomp "--skip --continue --resolved --abort"
 		return
 	fi
 	case "$cur" in

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ _git_am ()`
`667`	`667`	`{`
`668`	`668`	`local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"`
`669`	`669`	`if [ -d "$dir"/rebase-apply ]; then`
`670`		`- __gitcomp "--skip --resolved --abort"`
	`670`	`+ __gitcomp "--skip --continue --resolved --abort"`
`671`	`671`	`return`
`672`	`672`	`fi`
`673`	`673`	`case "$cur" in`