]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 564d025) | patch
merge-tree: accept 3 trees as arguments
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sun, 28 Jan 2024 20:34:22 +0000 (20:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jan 2024 17:20:49 +0000 (09:20 -0800)
commit5f43cf5b2e4b68386d3774bce880b0f74d801635
tree2f3227e4737970b14655393cf0ae9a0eb339e80etree | snapshot
parent564d0252ca632e0264ed670534a51d18a689ef5dcommit | diff
merge-tree: accept 3 trees as arguments

When specifying a merge base explicitly, there is actually no good
reason why the inputs need to be commits: that's only needed if the
merge base has to be deduced from the commit graph.

This commit is best viewed with `--color-moved
--color-moved-ws=allow-indentation-change`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt diff | blob | blame | history
builtin/merge-tree.c diff | blob | blame | history
t/t4301-merge-tree-write-tree.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.