]> git.ipfire.org Git - thirdparty/git.git/commit
merge-tree.c: allow specifying the merge-base when --stdin is passed
authorKyle Zhao <kylezhao@tencent.com>
Fri, 11 Nov 2022 23:45:14 +0000 (23:45 +0000)
committerTaylor Blau <me@ttaylorr.com>
Sun, 13 Nov 2022 04:53:04 +0000 (23:53 -0500)
commit501e3bab99da75eada3e2d6ef5257a3c44dd1ae4
tree48960fa73682627890ed48879436e303b2ffff50
parent66265a693e8deb3ab86577eb7f69940410044081
merge-tree.c: allow specifying the merge-base when --stdin is passed

The previous commit added a `--merge-base` option in order to allow
using a specified merge-base for the merge.  Extend the input accepted
by `--stdin` to also allow a specified merge-base with each merge
requested.  For example:

    printf "<b3> -- <b1> <b2>" | git merge-tree --stdin

does a merge of b1 and b2, and uses b3 as the merge-base.

Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Documentation/git-merge-tree.txt
builtin/merge-tree.c
t/t4301-merge-tree-write-tree.sh