From: Stephan Beyer Date: Wed, 23 Jul 2008 00:10:25 +0000 (+0200) Subject: am --abort: Add to bash-completion and mention in git-rerere documentation X-Git-Tag: v1.6.0-rc1~57 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a31c00b00eeadbc4b87ce2d578688e9b369a50fe;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index beebd5301..89f321b41 100644 --- 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 index 2edb341b5..8fc914528 100755 --- 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