]>
Commit | Line | Data |
---|---|---|
c16e30c0 JH |
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 | -------- | |
7791a1d9 | 11 | [verse] |
b1889c36 | 12 | 'git merge-tree' <base-tree> <branch1> <branch2> |
c16e30c0 JH |
13 | |
14 | DESCRIPTION | |
15 | ----------- | |
bb8040f9 | 16 | Reads three tree-ish, and output trivial merge results and |
c16e30c0 | 17 | conflicting stages to the standard output. This is similar to |
29b802aa | 18 | what three-way 'git read-tree -m' does, but instead of storing the |
c16e30c0 JH |
19 | results in the index, the command outputs the entries to the |
20 | standard output. | |
21 | ||
22 | This is meant to be used by higher level scripts to compute | |
29b802aa | 23 | merge results outside of the index, and stuff the results back into the |
c16e30c0 | 24 | index. For this reason, the output from the command omits |
29b802aa | 25 | entries that match the <branch1> tree. |
c16e30c0 | 26 | |
c16e30c0 JH |
27 | GIT |
28 | --- | |
9e1f0a85 | 29 | Part of the linkgit:git[1] suite |