Autogenerated HTML docs for v1.7.2-rc1-7-g869d

1 files changed, 11 insertions, 2 deletions

diff --git a/git-rerere.html b/git-rerere.html
index 1a745bc21..07a4bd56b 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -320,7 +320,7 @@ git-rerere(1) Manual Page
 </div>

 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

-<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>

+<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [&lt;pathspec&gt;]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>

 </div>

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

@@ -359,6 +359,15 @@ will automatically invoke this command.
 </p>

 </dd>

 <dt>

+<em>forget</em> &lt;pathspec&gt;

+</dt>

+<dd>

+<p>

+This resets the conflict resolutions which rerere has recorded for the current

+conflict in &lt;pathspec&gt;.  The &lt;pathspec&gt; is optional.

+</p>

+</dd>

+<dt>

 <em>diff</em>

 </dt>

 <dd>

@@ -528,7 +537,7 @@ conflict.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-04-24 02:56:06 UTC

+Last updated 2010-07-05 23:25:08 UTC

 </div>

 </div>

 </body>