]> git.99rst.org Git - git.git/commit
merge-tree: fix argument type of the `--merge-base` option
authorJohannes Schindelin <redacted>
Fri, 12 Apr 2024 12:10:40 +0000 (12:10 +0000)
committerJunio C Hamano <redacted>
Fri, 12 Apr 2024 16:10:43 +0000 (09:10 -0700)
commit0c6ee971fbed2cdd4a88721e116cc3867503418e
treebabcb4361b6a2434113fb920cbc22ea2c887ad92
parent342990c7aaef5ac645e89101cb84569caf64baf4
merge-tree: fix argument type of the `--merge-base` option

In 5f43cf5b2e4 (merge-tree: accept 3 trees as arguments, 2024-01-28), I
taught `git merge-tree` to perform three-way merges on trees. This
commit even changed the manual page to state that the `--merge-base`
option takes a tree-ish rather than requiring a commit.

But I forgot to adjust the in-program help text. This patch fixes that.

Signed-off-by: Johannes Schindelin <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge-tree.c
git clone https://git.99rst.org/PROJECT