[PATCH] documentation: 'git am --abort' also invokes 'git rerere clear'
- From
SZEDER Gábor <szeder@ira.uka.de>
- Date
- Jul 23, 2008, 17:14 UTC
- Message-ID
- <1216833293-15925-1-git-send-email-szeder@ira.uka.de>
Other git commands invoking 'git rerere clear' are mentioned there, except this.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> --- Documentation/git-rerere.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index beebd53..5246565 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -37,8 +37,8 @@ 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]' -will automatically invoke this command. +is aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase +[--skip|--abort]' will automatically invoke this command. 'diff'::
-- 1.6.0.rc0.36.g3c05