Autogenerated HTML docs for v2.37.3-662-g36f8e7e

1 files changed, 16 insertions, 11 deletions

diff --git a/git-merge.html b/git-merge.html
index 70dd8fdb4..ef87f6c59 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -1782,6 +1782,21 @@ substitutes the changed version instead.</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

+branch.&lt;name&gt;.mergeOptions

+</dt>

+<dd>

+<p>

+        Sets default options for merging into branch &lt;name&gt;. The syntax and

+        supported options are the same as those of <em>git merge</em>, but option

+        values containing whitespace characters are currently not supported.

+</p>

+</dd>

+</dl></div>

+<div class="paragraph"><p>Everything above this line in this section isn&#8217;t included from the

+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the

+same as what&#8217;s found there:</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

 merge.conflictStyle

 </dt>

 <dd>

@@ -2286,16 +2301,6 @@ merge.&lt;driver&gt;.recursive
         See <a href="gitattributes.html">gitattributes(5)</a> for details.

 </p>

 </dd>

-<dt class="hdlist1">

-branch.&lt;name&gt;.mergeOptions

-</dt>

-<dd>

-<p>

-        Sets default options for merging into branch &lt;name&gt;. The syntax and

-        supported options are the same as those of <em>git merge</em>, but option

-        values containing whitespace characters are currently not supported.

-</p>

-</dd>

 </dl></div>

 </div>

 </div>

@@ -2321,7 +2326,7 @@ branch.&lt;name&gt;.mergeOptions
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-08-18 14:11:07 PDT

+ 2022-09-14 13:23:11 PDT

 </div>

 </div>

 </body>