Autogenerated HTML docs for v2.51.0-491-g4b71b

Author: gitster

RelNotes/2.52.0.adoc

@@ -325,3 +325,4 @@ including security updates, are included in this release.
  (merge a66fc22bf9 rs/get-oid-with-flags-cleanup later to maint).
  (merge e1d062e8ba ps/odb-clean-stale-wrappers later to maint).
  (merge fdd21ba116 mh/doc-credential-url-prefix later to maint).
+ (merge 1c573a3451 en/doc-merge-tree-describe-merge-base later to maint).

git-merge-tree.adoc

@@ -79,11 +79,17 @@ OPTIONS
 
 --merge-base=<tree-ish>::
  Instead of finding the merge-bases for <branch1> and <branch2>,
- specify a merge-base for the merge, and specifying multiple bases is
-currently not supported. This option is incompatible with `--stdin`.
+ specify a merge-base for the merge. This option is incompatible with
+ `--stdin`.
 +
-As the merge-base is provided directly, <branch1> and <branch2> do not need
-to specify commits; trees are enough.
+Specifying multiple bases is currently not supported, which means that when
+merging two branches with more than one merge-base, using this option may
+cause merge results to differ from what `git merge` would compute. This
+can include potentially losing some changes made on one side of the history
+in the resulting merge.
++
+With this option, since the merge-base is provided directly, <branch1> and
+<branch2> do not need to specify commits; trees are enough.
 
 -X<option>::
 --strategy-option=<option>::

git-merge-tree.html

@@ -551,11 +551,18 @@ <h2 id="_options">OPTIONS</h2>
 <dtclass="hdlist1">--merge-base=&lt;tree-ish&gt;</dt>
 <dd>
 <p>Instead of finding the merge-bases for &lt;branch1&gt; and &lt;branch2&gt;,
-specify a merge-base for the merge, and specifying multiple bases is
-currently not supported. This option is incompatible with <code>--stdin</code>.</p>
+specify a merge-base for the merge. This option is incompatible with
+<code>--stdin</code>.</p>
 <divclass="paragraph">
-<p>As the merge-base is provided directly, &lt;branch1&gt; and &lt;branch2&gt; do not need
-to specify commits; trees are enough.</p>
+<p>Specifying multiple bases is currently not supported, which means that when
+merging two branches with more than one merge-base, using this option may
+cause merge results to differ from what <code>git</code><code>merge</code> would compute. This
+can include potentially losing some changes made on one side of the history
+in the resulting merge.</p>
+</div>
+<divclass="paragraph">
+<p>With this option, since the merge-base is provided directly, &lt;branch1&gt; and
+&lt;branch2&gt; do not need to specify commits; trees are enough.</p>
 </div>
 </dd>
 <dtclass="hdlist1">-X&lt;option&gt;</dt>
@@ -922,7 +929,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <divid="footer">
 <divid="footer-text">
-Last updated 2025-08-25 14:46:08 -0700
+Last updated 2025-10-10 14:32:39 -0700
 </div>
 </div>
 </body>