Skip to content

Commit d842e22

Browse files
committed
Merge branch 'js/merge-tree-3-trees'
Match the option argument type in the help text to the correct type updated by a recent series. * js/merge-tree-3-trees: merge-tree: fix argument type of the `--merge-base` option
2 parents 436d4e5 + 0c6ee97 commit d842e22

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)