Autogenerated HTML docs for v2.34.1-493-ge83ba

1 files changed, 13 insertions, 2 deletions

diff --git a/git-merge.html b/git-merge.html
index c58f97525..00ae76cc1 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -752,7 +752,8 @@ git-merge(1) Manual Page
 <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]

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

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

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

+        [--[no-]rerere-autoupdate] [-m &lt;msg&gt;] [-F &lt;file&gt;]

+        [--into-name &lt;branch&gt;] [&lt;commit&gt;&#8230;]

 <em>git merge</em> (--continue | --abort | --quit)</pre>

 <div class="attribution">

 </div></div>

@@ -1122,6 +1123,16 @@ used to give a good default for automated <em>git merge</em>
 invocations. The automated message can include the branch description.</p></div>

 </dd>

 <dt class="hdlist1">

+--into-name &lt;branch&gt;

+</dt>

+<dd>

+<p>

+        Prepare the default merge message as if merging to the branch

+        <code>&lt;branch&gt;</code>, instead of the name of the real branch to which

+        the merge is made.

+</p>

+</dd>

+<dt class="hdlist1">

 -F &lt;file&gt;

 </dt>

 <dt class="hdlist1">

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

 <div id="footer-text">

 Last updated

- 2021-12-15 12:58:55 PST

+ 2022-01-05 14:13:29 PST

 </div>

 </div>

 </body>