diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-01-28 20:34:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-29 09:20:49 -0800 |
| commit | 5f43cf5b2e4b68386d3774bce880b0f74d801635 (patch) | |
| tree | 2f3227e4737970b14655393cf0ae9a0eb339e80e /Documentation/git-merge-tree.txt | |
| parent | 564d0252ca632e0264ed670534a51d18a689ef5d (diff) | |
| download | git-5f43cf5b2e4b68386d3774bce880b0f74d801635.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index b50acace3b..dd388fa21d 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -64,10 +64,13 @@ OPTIONS share no common history. This flag can be given to override that check and make the merge proceed anyway. ---merge-base=<commit>:: +--merge-base=<tree-ish>:: Instead of finding the merge-bases for <branch1> and <branch2>, specify a merge-base for the merge, and specifying multiple bases is currently not supported. This option is incompatible with `--stdin`. ++ +As the merge-base is provided directly, <branch1> and <branch2> do not need +to specify commits; trees are enough. [[OUTPUT]] OUTPUT |