[PATCH] am --abort: Add to bash-completion and mention in git-rerere documentation
- From
Stephan Beyer <s-beyer@gmx.net>
- Date
- Jul 23, 2008, 00:10 UTC
- Message-ID
- <1216771825-21457-1-git-send-email-s-beyer@gmx.net>
- In-Reply-To
- <4882350B.6020003@free.fr>
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> --- Documentation/git-rerere.txt | 2 +- contrib/completion/git-completion.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index beebd53..89f321b 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 2edb341..8fc9145 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
-- 1.5.6.4.459.gfa44d