On Fri, Jan 26, 2024 at 9:01 AM Johannes Schindelin via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > When specifying a merge base explicitly, there is actually no good > reason why the inputs need to be commits: that's only needed if the > merge base has to be deduced from the commit graph. > > This commit is best viewed with `--color-moved > --color-moved-ws=allow-indentation-change`. > > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> > --- > diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt > @@ -64,10 +64,13 @@ 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`. > ++ > +As the merge-base is provided directly, <branch1> and <branch2> do not need > +o specify commits; it is sufficient if they specify trees. presumably: s/o/to/
