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