kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'en/doc-merge-tree-describe-merge-base' into next 

Clarify the "--merge-base" command line option in "git merge-tree".

* en/doc-merge-tree-describe-merge-base:
  Documentation/git-merge-tree.adoc: clarify the --merge-base option
next
Junio C Hamano 2025-10-06 14:31:51 -07:00
parent f639955fdc 1c573a3451
commit 787ff6f08a
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-merge-tree.adoc
View File

@ -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>::