Skip to content

Commit

Permalink
rerere.txt: Document forget subcommand
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael J Gruber authored and Junio C Hamano committed Jul 5, 2010
1 parent 66bd8ab commit 2c64034
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Documentation/git-rerere.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges

SYNOPSIS
--------
'git rerere' ['clear'|'diff'|'status'|'gc']
'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']

DESCRIPTION
-----------
Expand Down Expand Up @@ -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' <pathspec>::

This resets the conflict resolutions which rerere has recorded for the current
conflict in <pathspec>. The <pathspec> is optional.

'diff'::

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

0 comments on commit 2c64034

Please sign in to comment.