[PATCHv2] rerere.txt: Document forget subcommand
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Jul 5, 2010, 13:15 UTC
- Message-ID
- <4d2171a1aeb40321f5956da48f2a36e7709a8a7c.1278333908.git.git@drmicha.warpmail.net>
- In-Reply-To
- <7vljaeg9wt.fsf@alter.siamese.dyndns.org>
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> --- This somewhat fell under all radars.
v2 takes into account suggestions by Junio and Jay.
Documentation/git-rerere.txt | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index acc220a..db99d47 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' [<pathspec>]|'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' <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
-- 1.7.1.621.g01d76