From: Johannes Schindelin Date: Fri, 12 Apr 2024 12:10:40 +0000 (+0000) Subject: merge-tree: fix argument type of the `--merge-base` option X-Git-Tag: v2.45.0-rc0~29^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c6ee971fbed2cdd4a88721e116cc3867503418e;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 3492a575a6..60eaf0ca9f 100644 --- 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")),