diff options
| author | Elijah Newren <newren@gmail.com> | 2025-10-02 22:34:47 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-03 09:56:25 -0700 |
| commit | 1c573a34516ab869487ff1212e3244efdc1c402f (patch) | |
| tree | b2d731824f5d40d5370f91aceb970df3796a6ebd /string-list.c | |
| parent | c44beea485f0f2feaf460e2ac87fdd5608d63cf0 (diff) | |
Documentation/git-merge-tree.adoc: clarify the --merge-base option
The --merge-base option for merge-tree has a few slightly awkward
constructions or omissions:
* Split the initial long sentence describing the option into two,
making the instructions and the limitations clearer for readers.
* Add context to the final sentence that might be obvious to some
readers but isn't immediately obvious to all.
* The discussion about lack of support for multiple merge bases
simply leave folks wondering why that matters and could help or
hurt. Separate it out and add a brief explanation.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'string-list.c')
0 files changed, 0 insertions, 0 deletions