summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2010-02-12 15:11:47 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-12 09:08:17 -0800
commit85f6b439f2d6ddc468d20f5ab34e11882f00375a (patch)
tree1d1ecddbbea7f75806c5d807181c77916b484d1f
parent618d18b5aa9420fe446f7a1ed69d65fb45fa49b7 (diff)
downloadgit-85f6b439f2d6ddc468d20f5ab34e11882f00375a.tar.gz
bash: support 'git am's new '--continue' option
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 35acad004e..fe93747c93 100755
--- 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