Skip to content

Commit 2c64034

Browse files
Michael J Grubergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 66bd8ab commit 2c64034

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Documentation/git-rerere.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
77

88
SYNOPSIS
99
--------
10-
'git rerere' ['clear'|'diff'|'status'|'gc']
10+
'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
1111

1212
DESCRIPTION
1313
-----------
@@ -40,6 +40,11 @@ This resets the metadata used by rerere if a merge resolution is to be
4040
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
4141
will automatically invoke this command.
4242

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+
4348
'diff'::
4449

4550
This displays diffs for the current state of the resolution. It is

0 commit comments

Comments
 (0)