Code

bash: support 'git am's new '--continue' option
authorSZEDER Gábor <szeder@ira.uka.de>
Fri, 12 Feb 2010 14:11:47 +0000 (15:11 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2010 17:08:17 +0000 (09:08 -0800)
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash

index 35acad004e041d6c35316373635da45b61f6e8c0..fe93747c93a7b65f4657b56ef3962d64b48e3eb7 100755 (executable)
@@ -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