| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 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 | -------- |
| Martin von Zweigbergk | 7791a1d | 2011-07-01 22:38:26 -0400 | [diff] [blame] | 11 | [verse] |
| Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 12 | 'git merge-tree' <base-tree> <branch1> <branch2> |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 13 | |
| 14 | DESCRIPTION |
| 15 | ----------- |
| Richard Hansen | bb8040f | 2013-09-04 15:04:30 -0400 | [diff] [blame] | 16 | Reads three tree-ish, and output trivial merge results and |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 17 | conflicting stages to the standard output. This is similar to |
| Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 18 | what three-way 'git read-tree -m' does, but instead of storing the |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 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 |
| Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 23 | merge results outside of the index, and stuff the results back into the |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 24 | index. For this reason, the output from the command omits |
| Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 25 | entries that match the <branch1> tree. |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 26 | |
| Junio C Hamano | c16e30c | 2006-04-13 00:09:54 -0700 | [diff] [blame] | 27 | GIT |
| 28 | --- |
| Christian Couder | 9e1f0a8 | 2008-06-06 09:07:32 +0200 | [diff] [blame] | 29 | Part of the linkgit:git[1] suite |
