Autogenerated HTML docs for v1.7.10-rc1

1 files changed, 17 insertions, 8 deletions

diff --git a/git-rerere.html b/git-rerere.html
index 5ba3660ef..49684f010 100644
--- a/git-rerere.html
+++ b/git-rerere.html
@@ -583,7 +583,7 @@ git-rerere(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<div class="verseblock-content"><em>git rerere</em> [<em>clear</em>|<em>forget</em> &lt;pathspec&gt;|<em>diff</em>|<em>status</em>|<em>gc</em>]</div>

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

 <div class="verseblock-attribution">

 </div></div>

 </div>

@@ -618,7 +618,7 @@ its working state.</p></div>
 </dt>

 <dd>

 <p>

-This resets the metadata used by rerere if a merge resolution is to be

+Reset the metadata used by rerere if a merge resolution is to be

 aborted.  Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em>

 will automatically invoke this command.

 </p>

@@ -628,7 +628,7 @@ will automatically invoke this command.
 </dt>

 <dd>

 <p>

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

+Reset the conflict resolutions which rerere has recorded for the current

 conflict in &lt;pathspec&gt;.

 </p>

 </dd>

@@ -637,7 +637,7 @@ conflict in &lt;pathspec&gt;.
 </dt>

 <dd>

 <p>

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

+Display diffs for the current state of the resolution.  It is

 useful for tracking what has changed while the user is resolving

 conflicts.  Additional arguments are passed directly to the system

 <em>diff</em> command installed in PATH.

@@ -648,8 +648,17 @@ conflicts.  Additional arguments are passed directly to the system
 </dt>

 <dd>

 <p>

-Like <em>diff</em>, but this only prints the filenames that will be tracked

-for resolutions.

+Print paths with conflicts whose merge resolution rerere will record.

+</p>

+</dd>

+<dt class="hdlist1">

+<em>remaining</em>

+</dt>

+<dd>

+<p>

+Print paths with conflicts that have not been autoresolved by rerere.

+This includes paths whose resolutions cannot be tracked by rerere,

+such as conflicting submodules.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -657,7 +666,7 @@ for resolutions.
 </dt>

 <dd>

 <p>

-This prunes records of conflicted merges that

+Prune records of conflicted merges that

 occurred a long time ago.  By default, unresolved conflicts older

 than 15 days and resolved conflicts older than 60

 days are pruned.  These defaults are controlled via the

@@ -800,7 +809,7 @@ conflict.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2012-03-14 16:04:56 PDT

 </div>

 </div>

 </body>