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

sbeyer · gitster · commit a31c00b00eea · 2008-07-23T16:57:09.000-07:00
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 &lt;s-beyer@gmx.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
@@ -37,7 +37,7 @@ its working state.
 'clear'::
 
 This resets the metadata used by rerere if a merge resolution is to be
-is aborted.  Calling 'git-am --skip' or 'git-rebase [--skip|--abort]'
+aborted.  Calling 'git-am [--skip|--abort]' or 'git-rebase [--skip|--abort]'
 will automatically invoke this command.
 
 'diff'::
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ _git_am ()`
`489`	`489`	`{`
`490`	`490`	`local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)"`
`491`	`491`	`if [ -d "$dir"/rebase-apply ]; then`
`492`		`- __gitcomp "--skip --resolved"`
	`492`	`+ __gitcomp "--skip --resolved --abort"`
`493`	`493`	`return`
`494`	`494`	`fi`
`495`	`495`	`case "$cur" in`