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>
This commit is contained in:

committed by
Junio C Hamano

parent
618d18b5aa
commit
85f6b439f2
@ -667,7 +667,7 @@ _git_am ()
|
|||||||
{
|
{
|
||||||
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
|
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
|
||||||
if [ -d "$dir"/rebase-apply ]; then
|
if [ -d "$dir"/rebase-apply ]; then
|
||||||
__gitcomp "--skip --resolved --abort"
|
__gitcomp "--skip --continue --resolved --abort"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
case "$cur" in
|
case "$cur" in
|
||||||
|
Reference in New Issue
Block a user