1 files changed, 25 insertions, 1 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html
index f729e2c94..125723973 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -846,6 +846,16 @@ etc.
         check and make the merge proceed anyway.
 </p>
 </dd>
+<dt class="hdlist1">
+--merge-base=&lt;commit&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>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -1046,6 +1056,20 @@ any messages that would have been printed to stdout (the
 </div>
 </div>
 <div class="sect1">
+<h2 id="_input_format">INPUT FORMAT</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>git merge-tree --stdin</em> input format is fully text based. Each line
+has this format:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>[&lt;base-commit&gt; -- ]&lt;branch1&gt; &lt;branch2&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>If one line is separated by <code>--</code>, the string before the separator is
+used for specifying a merge-base for the merge and the string after
+the separator describes the branches to be merged.</p></div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_mistakes_to_avoid">MISTAKES TO AVOID</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Do NOT look through the resulting toplevel tree to try to find which
@@ -1128,7 +1152,7 @@ large repositories).</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2022-11-05 13:49:36 JST
+ 2022-12-14 18:45:42 JST
 </div>
 </div>
 </body>