diff options
| author | Kyle Zhao <kylezhao@tencent.com> | 2022-11-11 23:45:14 +0000 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-12 23:53:04 -0500 |
| commit | 501e3bab99da75eada3e2d6ef5257a3c44dd1ae4 (patch) | |
| tree | 48960fa73682627890ed48879436e303b2ffff50 /diffcore.h | |
| parent | merge-tree.c: add --merge-base=<commit> option (diff) | |
| download | git-501e3bab99da75eada3e2d6ef5257a3c44dd1ae4.tar.gz git-501e3bab99da75eada3e2d6ef5257a3c44dd1ae4.zip | |
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>
Diffstat (limited to 'diffcore.h')
0 files changed, 0 insertions, 0 deletions