Autogenerated HTML docs for v1.6.6-264-gd0743

1 files changed, 14 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index 55690bbdb..237ef9167 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -322,7 +322,7 @@ git-merge(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

 <div class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [-s &lt;strategy&gt;]&#8230;

-        [-m &lt;msg&gt;] &lt;remote&gt;&#8230;

+         [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] &lt;remote&gt;&#8230;

 <em>git merge</em> &lt;msg&gt; HEAD &lt;remote&gt;&#8230;</div></div>

 </div>

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

@@ -489,6 +489,18 @@ option can be used to override --squash.</p></div>
 </p>

 </dd>

 <dt>

+--rerere-autoupdate

+</dt>

+<dt>

+--no-rerere-autoupdate

+</dt>

+<dd>

+<p>

+        Allow the rerere mechanism to update the index with the

+        result of auto-conflict resolution if possible.

+</p>

+</dd>

+<dt>

 &lt;remote&gt;&#8230;

 </dt>

 <dd>

@@ -955,7 +967,7 @@ release/version name would be acceptable.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-03 09:12:41 UTC

+Last updated 2010-01-19 06:20:44 UTC

 </div>

 </div>

 </body>