From 2c64034491e302fa12ac86365dd872d9a75dc855 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Mon, 5 Jul 2010 15:15:20 +0200 Subject: [PATCH] rerere.txt: Document forget subcommand dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) introduced the forget subcommand for rerere. Document it. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-rerere.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index acc220a00..db99d4786 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- -'git rerere' ['clear'|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' []|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command. +'forget' :: + +This resets the conflict resolutions which rerere has recorded for the current +conflict in . The is optional. + 'diff':: This displays diffs for the current state of the resolution. It is -- 2.30.2