Autogenerated HTML docs for v1.5.3.4-498-g9c514

1 files changed, 7 insertions, 12 deletions

diff --git a/git-merge.html b/git-merge.html
index 329795b6a..f96f3ae3c 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -274,12 +274,16 @@ git-merge(1) Manual Page
 <div class="sectionbody">

 <div class="verseblock">

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

-        [-m &lt;msg&gt;] &lt;remote&gt; &lt;remote&gt;&#8230;</div></div>

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

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

 </div>

 <h2>DESCRIPTION</h2>

 <div class="sectionbody">

 <p>This is the top-level interface to the merge machinery

 which drives multiple merge strategy scripts.</p>

+<p>The second syntax (&lt;msg&gt; <tt>HEAD</tt> &lt;remote&gt;) is supported for

+historical reasons.  Do not use it from the command line or in

+new scripts.  It is the same as <tt>git merge -m &lt;msg&gt; &lt;remote&gt;</tt>.</p>

 </div>

 <h2>OPTIONS</h2>

 <div class="sectionbody">

@@ -375,7 +379,7 @@ which drives multiple merge strategy scripts.</p>
 </p>

 </dd>

 <dt>

-&lt;msg&gt;

+-m &lt;msg&gt;

 </dt>

 <dd>

 <p>

@@ -385,15 +389,6 @@ which drives multiple merge strategy scripts.</p>
 </p>

 </dd>

 <dt>

-&lt;head&gt;

-</dt>

-<dd>

-<p>

-        Our branch head commit.  This has to be <tt>HEAD</tt>, so new

-        syntax does not require it

-</p>

-</dd>

-<dt>

 &lt;remote&gt;

 </dt>

 <dd>

@@ -653,7 +648,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Oct-2007 12:03:50 UTC

+Last updated 31-Oct-2007 05:56:48 UTC

 </div>

 </div>

 </body>