mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 18:46:09 +02:00
Code

Merge branch 'js/merge-tree-3-trees' into next 

"git merge-tree" has learned that the three trees involved in the
3-way merge only need to be trees, not necessarily commits.

* js/merge-tree-3-trees:
  merge-tree: fix argument type of the `--merge-base` option
This commit is contained in:
Junio C Hamano 2024-04-12 10:42:14 -07:00
parent 3c40516874 0c6ee971fb
commit d4235d1f47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge-tree.c
View File

@ -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")),