Autogenerated HTML docs for v2.12.2-575-gb14f2

1 files changed, 2 insertions, 6 deletions

diff --git a/git-merge.html b/git-merge.html
index 49aa84887..9bbbb6127 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -752,7 +752,6 @@ git-merge(1) Manual Page
         [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]

         [--[no-]allow-unrelated-histories]

         [--[no-]rerere-autoupdate] [-m <msg>] [<commit>…]

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

 <em>git merge</em> --abort

 <em>git merge</em> --continue</pre>

 <div class="attribution">

@@ -786,10 +785,7 @@ a log message from the user describing the changes.</p></div>
          /         \

     D---E---F---G---H master</code></pre>

 </div></div>

-<div class="paragraph"><p>The second syntax (&lt;msg&gt; <code>HEAD</code> &lt;commit&gt;&#8230;) is supported for

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

-new scripts.  It is the same as <code>git merge -m &lt;msg&gt; &lt;commit&gt;...</code>.</p></div>

-<div class="paragraph"><p>The third syntax ("<code>git merge --abort</code>") can only be run after the

+<div class="paragraph"><p>The second syntax ("<code>git merge --abort</code>") can only be run after the

 merge has resulted in conflicts. <em>git merge --abort</em> will abort the

 merge process and try to reconstruct the pre-merge state. However,

 if there were uncommitted changes when the merge started (and

@@ -1912,7 +1908,7 @@ branch.&lt;name&gt;.mergeOptions
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2016-12-27 14:37:07 PST

+Last updated 2017-03-30 16:00:02 PDT

 </div>

 </div>

 </body>