diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-07 16:03:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-07 16:03:23 -0800 |
| commit | d2c69b605afd8b35f402e2ac9d01d9ee195116e0 (patch) | |
| tree | 6485f24a40d829c3f7db5abbc3534def77b48f22 /git-merge-tree.html | |
| parent | e13743909da808044f9ce2250fa7d449c991ecb2 (diff) | |
| download | git-htmldocs-d2c69b605afd8b35f402e2ac9d01d9ee195116e0.tar.gz | |
Autogenerated HTML docs for v2.44.0-165-ge09f12
Diffstat (limited to 'git-merge-tree.html')
| -rw-r--r-- | git-merge-tree.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-merge-tree.html b/git-merge-tree.html index a429f6aea..4a9700b2d 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html @@ -847,7 +847,7 @@ etc. </p>
</dd>
<dt class="hdlist1">
---merge-base=<commit>
+--merge-base=<tree-ish>
</dt>
<dd>
<p>
@@ -855,6 +855,8 @@ etc. specify a merge-base for the merge, and specifying multiple bases is
currently not supported. This option is incompatible with <code>--stdin</code>.
</p>
+<div class="paragraph"><p>As the merge-base is provided directly, <branch1> and <branch2> do not need
+to specify commits; trees are enough.</p></div>
</dd>
</dl></div>
</div>
@@ -1152,7 +1154,7 @@ large repositories).</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2023-10-23 14:43:46 PDT
+ 2024-03-07 16:01:15 PST
</div>
</div>
</body>
|