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

DESCRIPTION

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

AUTHOR

23       Written by Linus Torvalds <torvalds@osdl.org[1]>
24

DOCUMENTATION

26       Documentation by Junio C Hamano and the git-list
27       <git@vger.kernel.org[2]>.
28

GIT

30       Part of the git(1) suite
31

NOTES

33        1. torvalds@osdl.org
34           mailto:torvalds@osdl.org
35
36        2. git@vger.kernel.org
37           mailto:git@vger.kernel.org
38
39
40
41Git 1.7.1                         08/16/2017                 GIT-MERGE-TREE(1)
Impressum