| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [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 | -------- |
| Junio C Hamano | 15567bc | 2011-07-23 00:51:59 | [diff] [blame] | 11 | [verse] |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 12 | 'git merge-tree' <base-tree> <branch1> <branch2> |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [diff] [blame] | 13 | |
| 14 | DESCRIPTION |
| 15 | ----------- |
| Junio C Hamano | e6f28d0 | 2013-09-17 21:34:00 | [diff] [blame] | 16 | Reads three tree-ish, and output trivial merge results and |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [diff] [blame] | 17 | conflicting stages to the standard output. This is similar to |
| Junio C Hamano | ec87f52 | 2008-12-10 08:35:25 | [diff] [blame] | 18 | what three-way 'git read-tree -m' does, but instead of storing the |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [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 |
| Junio C Hamano | ec87f52 | 2008-12-10 08:35:25 | [diff] [blame] | 23 | merge results outside of the index, and stuff the results back into the |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [diff] [blame] | 24 | index. For this reason, the output from the command omits |
| Junio C Hamano | ec87f52 | 2008-12-10 08:35:25 | [diff] [blame] | 25 | entries that match the <branch1> tree. |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [diff] [blame] | 26 | |
| Junio C Hamano | 54559c8 | 2006-04-13 07:45:12 | [diff] [blame] | 27 | GIT |
| 28 | --- |
| Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 29 | Part of the linkgit:git[1] suite |
