Autogenerated HTML docs for v2.8.1-116-g7b0d4

1 files changed, 19 insertions, 1 deletions

diff --git a/git-merge.html b/git-merge.html
index e17ce7378..c220e0359 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1064,6 +1064,24 @@ 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">

+--allow-unrelated-histories

+</dt>

+<dd>

+<p>

+        By default, <code>git merge</code> command refuses to merge histories

+        that do not share a common ancestor.  This option can be

+        used to override this safety when merging histories of two

+        projects that started their lives independently.  As that is

+        a very rare occasion, no configuration variable to enable

+        this by default exists and will not be added, and the list

+        of options at the top of this documentation does not mention

+        this option.  Also <code>git pull</code> does not pass this option down

+        to <code>git merge</code> (instead, you <code>git fetch</code> first, examine what

+        you will be merging and then <code>git merge</code> locally with this

+        option).

+</p>

+</dd>

+<dt class="hdlist1">

 &lt;commit&gt;&#8230;

 </dt>

 <dd>

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

 <div id="footer">

 <div id="footer-text">

-Last updated 2015-10-05 13:38:43 PDT

+Last updated 2016-04-08 14:53:26 PDT

 </div>

 </div>

 </body>