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
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 index, and stuff the results back into the index. For
19       this reason, the output from the command omits entries that match
20       <branch1> tree.
21

AUTHOR

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

DOCUMENTATION

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

GIT

29       Part of the git(7) suite
30
31
32
33
34Git 1.5.3.3                       10/09/2007                 GIT-MERGE-TREE(1)
Impressum