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