diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-24 04:03:33 +0000 |
| commit | ccc2f7606414a57fc7f34d2f88f8fb2246918d6d (patch) | |
| tree | 086aa0acaa44a0fadc1de3344e5121f865623f32 /git-rerere.txt | |
| parent | 0868a302deebe5253106fdf9af00c82e2c711e66 (diff) | |
| download | git-htmldocs-ccc2f7606414a57fc7f34d2f88f8fb2246918d6d.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc0-42-g186458
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index beebd5301..89f321b41 100644 --- a/git-rerere.txt +++ b/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':: |