'\" t .\" Title: git-merge-tree .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> .\" Date: 04/06/2011 .\" Manual: Git Manual .\" Source: Git 1.7.4.4 .\" Language: English .\" .TH "GIT\-MERGE\-TREE" "1" "04/06/2011" "Git 1\&.7\&.4\&.4" "Git Manual" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .\" ----------------------------------------------------------------- .\" * MAIN CONTENT STARTS HERE * .\" ----------------------------------------------------------------- .SH "NAME" git-merge-tree \- Show three\-way merge without touching index .SH "SYNOPSIS" .sp \fIgit merge\-tree\fR <base\-tree> <branch1> <branch2> .SH "DESCRIPTION" .sp Reads three treeish, and output trivial merge results and conflicting stages to the standard output\&. This is similar to what three\-way \fIgit read\-tree \-m\fR does, but instead of storing the results in the index, the command outputs the entries to the standard output\&. .sp This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index\&. For this reason, the output from the command omits entries that match the <branch1> tree\&. .SH "AUTHOR" .sp Written by Linus Torvalds <\m[blue]\fBtorvalds@osdl\&.org\fR\m[]\&\s-2\u[1]\d\s+2> .SH "DOCUMENTATION" .sp Documentation by Junio C Hamano and the git\-list <\m[blue]\fBgit@vger\&.kernel\&.org\fR\m[]\&\s-2\u[2]\d\s+2>\&. .SH "GIT" .sp Part of the \fBgit\fR(1) suite .SH "NOTES" .IP " 1." 4 torvalds@osdl.org .RS 4 \%mailto:torvalds@osdl.org .RE .IP " 2." 4 git@vger.kernel.org .RS 4 \%mailto:git@vger.kernel.org .RE