1GIT-MERGE-TREE(1)                 Git Manual                 GIT-MERGE-TREE(1)
2
3
4

NAME

6       git-merge-tree - Show three-way merge without touching index
7

SYNOPSIS

9       git merge-tree <base-tree> <branch1> <branch2>
10
11

DESCRIPTION

13       Reads three tree-ish, and output trivial merge results and conflicting
14       stages to the standard output. This is similar to what three-way git
15       read-tree -m does, but instead of storing the results in the index, the
16       command outputs the entries to the standard output.
17
18       This is meant to be used by higher level scripts to compute merge
19       results outside of the index, and stuff the results back into the
20       index. For this reason, the output from the command omits entries that
21       match the <branch1> tree.
22

GIT

24       Part of the git(1) suite
25
26
27
28Git 2.24.1                        12/10/2019                 GIT-MERGE-TREE(1)
Impressum