Autogenerated HTML docs for v1.7.1-rc1-12-ga601

1 files changed, 15 insertions, 14 deletions

diff --git a/git-merge.html b/git-merge.html
index bd1d3247c..ae23881ae 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -321,7 +321,8 @@ git-merge(1) Manual Page
 <h2>SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

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

+<div class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash]

+        [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;]

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

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

 </div>

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

 </dd>

 <dt>

+-X &lt;option&gt;

+</dt>

+<dt>

+--strategy-option=&lt;option&gt;

+</dt>

+<dd>

+<p>

+        Pass merge strategy specific option through to the merge

+        strategy.

+</p>

+</dd>

+<dt>

 --summary

 </dt>

 <dt>

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

 </dd>

 <dt>

--X &lt;option&gt;

-</dt>

-<dt>

---strategy-option=&lt;option&gt;

-</dt>

-<dd>

-<p>

-        Pass merge strategy specific option through to the merge

-        strategy.

-</p>

-</dd>

-<dt>

 -m &lt;msg&gt;

 </dt>

 <dd>

@@ -1019,7 +1020,7 @@ branch.&lt;name&gt;.mergeoptions
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2010-03-15 20:32:30 UTC

+Last updated 2010-04-14 14:07:15 UTC

 </div>

 </div>

 </body>