]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 436d4e5 0c6ee97)
Merge branch 'js/merge-tree-3-trees'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2024 18:31:38 +0000 (11:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Apr 2024 18:31:38 +0000 (11:31 -0700)
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

1  2 
builtin/merge-tree.c patch | diff1 | diff2 | blob | history

diff --cc builtin/merge-tree.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.