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

The git-rerere documentation talks about commands that invoke
"git rerere clear" automatically. git am --abort is added and
a typo is fixed additionally.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stephan Beyer
2008-07-23 02:10:25 +02:00
committed by Junio C Hamano
parent a4661b018d
commit a31c00b00e
2 changed files with 2 additions and 2 deletions

View File

@ -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