]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitd842e22ebbb2d70e11f8055c5cd7d1d4e1a90e2e
tree863c9c7050e0fc50e8bbfb700fa6a8948f7f6de8tree | snapshot
parent436d4e5b14df49870a897f64fe92c0ddc7017e4ccommit | diff
parent0c6ee971fbed2cdd4a88721e116cc3867503418ecommit | diff
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
builtin/merge-tree.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.