]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bee6e7a 4cc9eb3)
Merge branch 'kz/merge-tree-merge-base'
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2022 06:55:45 +0000 (15:55 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2022 06:55:46 +0000 (15:55 +0900)
commit7576e512cec7630ba2a35af33fa00868cedb8e18
tree347953cd004aaea240335fd3e0785d4d17ba5c20tree | snapshot
parentbee6e7a8f9951e486827bdebd14ab6d93b50a1bfcommit | diff
parent4cc9eb338d8773b4c3909368445404745f94ce69commit | diff
Merge branch 'kz/merge-tree-merge-base'

"merge-tree" learns a new `--merge-base` option.

* kz/merge-tree-merge-base:
  docs: fix description of the `--merge-base` option
  merge-tree.c: allow specifying the merge-base when --stdin is passed
  merge-tree.c: add --merge-base=<commit> option
builtin/merge-tree.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.