From: Michael J Gruber Date: Tue, 15 Jun 2010 06:21:06 GMT Subject: [PATCH] rerere.txt: Document forget subcommand Message-ID: In-Reply-To: dea4562 (rerere forget path: forget recorded resolution, 2009-12-25) introduced the forget subcommand for rerere. Document it. Signed-off-by: Michael J Gruber --- Documentation/git-rerere.txt | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index acc220a..a7370d3 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,10 @@ 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 . + 'diff':: This displays diffs for the current state of the resolution. It is -- 1.7.1.511.gfbed4