freshlybakedca.ke
Git fork
Merge branch 'en/doc-merge-tree-describe-merge-base' into maint-2.51
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
+10
-4
Documentation/git-merge-tree.adoc
+10
-4
Documentation/git-merge-tree.adoc
···
78
78
79
79
--merge-base=<tree-ish>::
80
80
Instead of finding the merge-bases for <branch1> and <branch2>,
81
-
specify a merge-base for the merge, and specifying multiple bases is
82
-
currently not supported. This option is incompatible with `--stdin`.
81
+
specify a merge-base for the merge. This option is incompatible with
82
+
`--stdin`.
83
83
+
84
-
As the merge-base is provided directly, <branch1> and <branch2> do not need
85
-
to specify commits; trees are enough.
84
+
Specifying multiple bases is currently not supported, which means that when
85
+
merging two branches with more than one merge-base, using this option may
86
+
cause merge results to differ from what `git merge` would compute. This
87
+
can include potentially losing some changes made on one side of the history
88
+
in the resulting merge.
89
+
+
90
+
With this option, since the merge-base is provided directly, <branch1> and
91
+
<branch2> do not need to specify commits; trees are enough.
86
92
87
93
-X<option>::
88
94
--strategy-option=<option>::