diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-23 02:10:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-23 16:57:09 -0700 |
| commit | a31c00b00eeadbc4b87ce2d578688e9b369a50fe (patch) | |
| tree | 81e1b82bf3f4cf83cb808a58b62294ff50ffbf63 /contrib | |
| parent | a4661b018d46699fd6a9f59932e60267bae3ca2a (diff) | |
| download | git-a31c00b00eeadbc4b87ce2d578688e9b369a50fe.tar.gz git-a31c00b00eeadbc4b87ce2d578688e9b369a50fe.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
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 |