GIT\-MERGE\-TREESection: Git Manual (1)
Index Return to Main Contents
NAMEgit-merge-tree - Show three-way merge without touching index
SYNOPSISgit-merge-tree <base-tree> <branch1> <branch2>
DESCRIPTIONReads three treeish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way read-tree -m does, but instead of storing the results in the index, the command outputs the entries to the standard output.
This is meant to be used by higher level scripts to compute merge results outside index, and stuff the results back into the index. For this reason, the output from the command omits entries that match <branch1> tree.
AUTHORWritten by Linus Torvalds <email@example.com>
DOCUMENTATIONDocumentation by Junio C Hamano and the git-list <firstname.lastname@example.org>.
GITPart of the git(7) suite