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.txt | |
| parent | e13743909da808044f9ce2250fa7d449c991ecb2 (diff) | |
| download | git-htmldocs-d2c69b605afd8b35f402e2ac9d01d9ee195116e0.tar.gz | |
Autogenerated HTML docs for v2.44.0-165-ge09f12
Diffstat (limited to 'git-merge-tree.txt')
| -rw-r--r-- | git-merge-tree.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge-tree.txt b/git-merge-tree.txt index b50acace3..dd388fa21 100644 --- a/git-merge-tree.txt +++ b/git-merge-tree.txt @@ -64,10 +64,13 @@ OPTIONS share no common history. This flag can be given to override that check and make the merge proceed anyway. ---merge-base=<commit>:: +--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`. ++ +As the merge-base is provided directly, <branch1> and <branch2> do not need +to specify commits; trees are enough. [[OUTPUT]] OUTPUT |