diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:35 -0700 |
| commit | 92043e94602cbc561a06363c7b386fcf022dab02 (patch) | |
| tree | 629e442f12327856ad7c35d8d0d0285ed201ad5c | |
| parent | Merge branch 'mh/doc-credential-url-prefix' into maint-2.51 (diff) | |
| parent | Documentation/git-merge-tree.adoc: clarify the --merge-base option (diff) | |
| download | git-92043e94602cbc561a06363c7b386fcf022dab02.tar.gz git-92043e94602cbc561a06363c7b386fcf022dab02.zip | |
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
| -rw-r--r-- | Documentation/git-merge-tree.adoc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc index f824eea61f..4e13ed33d6 100644 --- a/Documentation/git-merge-tree.adoc +++ b/Documentation/git-merge-tree.adoc @@ -78,11 +78,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>:: |