]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
"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

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.