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>
Stephan Beyer committed
Jul 23, 2008 at 02:10 UTC
a31c00b00eeadbc4b87ce2d578688e9b369a50fe
2 files changed
+2
-2
Documentation/git-rerere.txt
+1
-1
@@ -37,7 +37,7 @@ its working state.
37
'clear'::
38
39
This resets the metadata used by rerere if a merge resolution is to be
40
-is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]'
40
+aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]'
41
will automatically invoke this command.
42
43
'diff'::
contrib/completion/git-completion.bash
+1
-1
@@ -489,7 +489,7 @@ _git_am ()
489
{
490
local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"
491
if [ -d "$dir"/rebase-apply ]; then
492
- __gitcomp "--skip --resolved"
492
+ __gitcomp "--skip --resolved --abort"
493
return
494
fi
495
case "$cur" in