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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael J Gruber committed
Jul 5, 2010 at 15:15 UTC
2c64034491e302fa12ac86365dd872d9a75dc855
1 file changed
+6
-1
Documentation/git-rerere.txt
+6
-1
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
7
8
SYNOPSIS
9
--------
10
-'git rerere' ['clear'|'diff'|'status'|'gc']
10
+'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
11
12
DESCRIPTION
13
-----------
@@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be
40
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
41
will automatically invoke this command.
42
43
+'forget' <pathspec>::
44
+
45
+This resets the conflict resolutions which rerere has recorded for the current
46
+conflict in <pathspec>. The <pathspec> is optional.
47
+
48
'diff'::
49
50
This displays diffs for the current state of the resolution. It is