diff options
| author | Kyle Zhao <kylezhao@tencent.com> | 2022-11-11 23:45:13 +0000 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-12 23:53:04 -0500 |
| commit | 66265a693e8deb3ab86577eb7f69940410044081 (patch) | |
| tree | d2efd3dba5320d5efb55dade00c4ea9161e748bc /builtin/commit.c | |
| parent | merge-tree: support multiple batched merges with --stdin (diff) | |
| download | git-66265a693e8deb3ab86577eb7f69940410044081.tar.gz git-66265a693e8deb3ab86577eb7f69940410044081.zip | |
merge-tree.c: add --merge-base=<commit> option
This patch will give our callers more flexibility to use `git merge-tree`,
such as:
git merge-tree --write-tree --merge-base=branch^ HEAD branch
This does a merge of HEAD and branch, but uses branch^ as the merge-base.
And the reason why using an option flag instead of a positional argument
is to allow additional commits passed to merge-tree to be handled via an
octopus merge in the future.
Signed-off-by: Kyle Zhao <kylezhao@tencent.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions