{"thread":{"id":"64241","subject":"[PATCH] Documentation/git-merge-tree.adoc: clarify the --merge-base option","startedAt":"2025-10-02T22:34:49Z","lastAt":"2025-10-02T22:34:49Z","messageCount":1,"participants":["Elijah Newren via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"527842","messageId":"pull.1980.git.1759444487406.gitgitgadget@gmail.com","threadId":"64241","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge-tree.adoc: clarify the --merge-base option","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2025-10-02T22:34:47Z","receivedAt":"2025-10-02T22:34:49Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\nThe --merge-base option for merge-tree has a few slightly awkward\nconstructions or omissions:\n  * Split the initial long sentence describing the option into two,\n    making the instructions and the limitations clearer for readers.\n  * Add context to the final sentence that might be obvious to some\n    readers but isn't immediately obvious to all.\n  * The discussion about lack of support for multiple merge bases\n    simply leave folks wondering why that matters and could help or\n    hurt.  Separate it out and add a brief explanation.\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n    Documentation/git-merge-tree.adoc: clarify the --merge-base option\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1980%2Fnewren%2Fmerge-tree-merge-base-clarifications-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1980/newren/merge-tree-merge-base-clarifications-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1980\n\n Documentation/git-merge-tree.adoc | 14 ++++++++++----\n 1 file changed, 10 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-merge-tree.adoc b/Documentation/git-merge-tree.adoc\nindex f824eea61f..4e13ed33d6 100644\n--- a/Documentation/git-merge-tree.adoc\n+++ b/Documentation/git-merge-tree.adoc\n@@ -78,11 +78,17 @@ OPTIONS\n \n --merge-base=<tree-ish>::\n \tInstead of finding the merge-bases for <branch1> and <branch2>,\n-\tspecify a merge-base for the merge, and specifying multiple bases is\n-\tcurrently not supported. This option is incompatible with `--stdin`.\n+\tspecify a merge-base for the merge.  This option is incompatible with\n+\t`--stdin`.\n +\n-As the merge-base is provided directly, <branch1> and <branch2> do not need\n-to specify commits; trees are enough.\n+Specifying multiple bases is currently not supported, which means that when\n+merging two branches with more than one merge-base, using this option may\n+cause merge results to differ from what `git merge` would compute.  This\n+can include potentially losing some changes made on one side of the history\n+in the resulting merge.\n++\n+With this option, since the merge-base is provided directly, <branch1> and\n+<branch2> do not need to specify commits; trees are enough.\n \n -X<option>::\n --strategy-option=<option>::\n\nbase-commit: c44beea485f0f2feaf460e2ac87fdd5608d63cf0\n-- \ngitgitgadget\n"}]}