Improve language in git-merge.txt and related docs
[git/git.git] / Documentation / git-merge-tree.txt
CommitLineData
c16e30c0
JH
1git-merge-tree(1)
2=================
3
4NAME
5----
6git-merge-tree - Show three-way merge without touching index
7
8
9SYNOPSIS
10--------
b1889c36 11'git merge-tree' <base-tree> <branch1> <branch2>
c16e30c0
JH
12
13DESCRIPTION
14-----------
15Reads three treeish, and output trivial merge results and
16conflicting stages to the standard output. This is similar to
29b802aa 17what three-way 'git read-tree -m' does, but instead of storing the
c16e30c0
JH
18results in the index, the command outputs the entries to the
19standard output.
20
21This is meant to be used by higher level scripts to compute
29b802aa 22merge results outside of the index, and stuff the results back into the
c16e30c0 23index. For this reason, the output from the command omits
29b802aa 24entries that match the <branch1> tree.
c16e30c0
JH
25
26Author
27------
28Written by Linus Torvalds <torvalds@osdl.org>
29
30Documentation
31--------------
32Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
33
34GIT
35---
9e1f0a85 36Part of the linkgit:git[1] suite