Browse Source

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>
maint
SZEDER Gábor 15 years ago committed by Junio C Hamano
parent
commit
85f6b439f2
  1. 2
      contrib/completion/git-completion.bash

2
contrib/completion/git-completion.bash

@ -667,7 +667,7 @@ _git_am () @@ -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

Loading…
Cancel
Save