Skip to content

Commit 3e719bd

Browse files
committed
merge-tree: fix argument type of the --merge-base option
In 5f43cf5 (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 <[email protected]>
1 parent 342990c commit 3e719bd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/merge-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
563563
PARSE_OPT_NONEG),
564564
OPT_STRING(0, "merge-base",
565565
&merge_base,
566-
N_("commit"),
566+
N_("tree-ish"),
567567
N_("specify a merge-base for the merge")),
568568
OPT_STRVEC('X', "strategy-option", &xopts, N_("option=value"),
569569
N_("option for selected merge strategy")),

0 commit comments

Comments
 (0)