Autogenerated HTML docs for v2.8.2-294-gbbc61

1 files changed, 15 insertions, 19 deletions

diff --git a/git-merge.html b/git-merge.html
index c53a382d6..161c8c6db 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -750,6 +750,7 @@ git-merge(1) Manual Page
 <div class="verseblock">

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

         [-s &lt;strategy&gt;] [-X &lt;strategy-option&gt;] [-S[&lt;keyid&gt;]]

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

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

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

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

@@ -1013,6 +1014,19 @@ option can be used to override --squash.</p></div>
 </p>

 </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.

+</p>

+</dd>

+<dt class="hdlist1">

 -S[&lt;keyid&gt;]

 </dt>

 <dt class="hdlist1">

@@ -1064,24 +1078,6 @@ 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>

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

 <div id="footer">

 <div id="footer-text">

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

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

 </div>

 </div>

 </body>