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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 3492a575a6c784e01a21a4bf5f458124f636c4cb..60eaf0ca9f1af3f67a41bc1df96b2a58a04c6b91 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
                           PARSE_OPT_NONEG),
                OPT_STRING(0, "merge-base",
                           &merge_base,
-                          N_("commit"),
+                          N_("tree-ish"),
                           N_("specify a merge-base for the merge")),
                OPT_STRVEC('X', "strategy-option", &xopts, N_("option=value"),
                        N_("option for selected merge strategy")),