Autogenerated HTML docs for v2.11.0-258-ge0580

1 files changed, 15 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index 6403905e7..49aa84887 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -753,7 +753,8 @@ git-merge(1) Manual Page
         [--[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</pre>

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

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

 <div class="attribution">

 </div></div>

 </div>

@@ -798,6 +799,8 @@ reconstruct the original (pre-merge) changes. Therefore:</p></div>
 <div class="paragraph"><p><strong>Warning</strong>: Running <em>git merge</em> with non-trivial uncommitted changes is

 discouraged: while possible, it may leave you in a state that is hard to

 back out of in the case of a conflict.</p></div>

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

+merge has resulted in conflicts.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -1081,6 +1084,16 @@ commit or stash your changes before running <em>git merge</em>.</p></div>
 <code>MERGE_HEAD</code> is present.</p></div>

 </dd>

 <dt class="hdlist1">

+--continue

+</dt>

+<dd>

+<p>

+        After a <em>git merge</em> stops due to conflicts you can conclude the

+        merge by running <em>git merge --continue</em> (see "HOW TO RESOLVE

+        CONFLICTS" section below).

+</p>

+</dd>

+<dt class="hdlist1">

 &lt;commit&gt;&#8230;

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2016-04-29 14:54:31 PDT

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

 </div>

 </div>

 </body>