X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rerere.txt;h=a6253ba617f5ebcd82e4cfb1702999c145fa346c;hb=cec3e186f7b76cdced54286ef1da42b6978c4c8d;hp=acc220a00f0013d115366cfc8b7a48aeeef47711;hpb=71ee7fd15457a0252c089420b5b66de266dcbd2f;p=git.git

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index acc220a00..a6253ba61 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,7 +7,8 @@ git-rerere - Reuse recorded resolution of conflicted merges
 
 SYNOPSIS
 --------
-'git rerere' ['clear'|'diff'|'status'|'gc']
+[verse]
+'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
 
 DESCRIPTION
 -----------
@@ -40,6 +41,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>.
+
 'diff'::
 
 This displays diffs for the current state of the resolution.  It is
@@ -200,11 +206,6 @@ would conflict the same way as the test merge you resolved earlier.
 'git rerere' will be run by 'git rebase' to help you resolve this
 conflict.
 
-
-Author
-------
-Written by Junio C Hamano <gitster@pobox.com>
-
 GIT
 ---
 Part of the linkgit:git[1] suite