am --abort: Add to bash-completion and mention in git-rerere documentation

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2edb341b570315b6ac1500775e03897a24afb23e..8fc9145282ccc0ff74140a5d50c91875a43948c4 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -489,7 +489,7 @@ _git_am ()
 {
        local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
        if [ -d "$dir"/rebase-apply ]; then
-               __gitcomp "--skip --resolved"
+               __gitcomp "--skip --resolved --abort"
                return
        fi
        case "$cur" in