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 /Documentation/git-merge-tree.txt | |
| parent | ec1edbcb56ac05e9980299b05924c5c1b51d68b4 (diff) | |
| download | git-66265a693e8deb3ab86577eb7f69940410044081.tar.gz | |
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 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 04bcc416e6..d9dacb2ce5 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -64,6 +64,10 @@ OPTIONS share no common history. This flag can be given to override that check and make the merge proceed anyway. +--merge-base=<commit>:: + Instead of finding the merge-bases for <branch1> and <branch2>, + specify a merge-base for the merge. + [[OUTPUT]] OUTPUT ------ |