diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-07-23 04:10:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-24 03:57:09 +0400 |
| commit | a31c00b00eeadbc4b87ce2d578688e9b369a50fe (patch) | |
| tree | 81e1b82bf3f4cf83cb808a58b62294ff50ffbf63 /Documentation/git-rerere.txt | |
| parent | a4661b018d46699fd6a9f59932e60267bae3ca2a (diff) | |
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 'Documentation/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index beebd5301f..89f321b414 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':: |