diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-12 11:31:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-12 11:31:38 -0700 |
| commit | d842e22ebbb2d70e11f8055c5cd7d1d4e1a90e2e (patch) | |
| tree | 863c9c7050e0fc50e8bbfb700fa6a8948f7f6de8 | |
| parent | 436d4e5b14df49870a897f64fe92c0ddc7017e4c (diff) | |
| parent | 0c6ee971fbed2cdd4a88721e116cc3867503418e (diff) | |
| download | git-d842e22ebbb2d70e11f8055c5cd7d1d4e1a90e2e.tar.gz | |
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
| -rw-r--r-- | builtin/merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index 05d0cad554..8bdb439131 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")), |