linux man page for git-merge-tree

Query: git-merge-tree

OS: linux

Section: 1

Format: Original Unix Latex Style Formatted with HTML and a Horizontal Scroll Bar

GIT-MERGE-TREE(1)						    Git Manual							 GIT-MERGE-TREE(1)

NAME
git-merge-tree - Show three-way merge without touching index
SYNOPSIS
git merge-tree <base-tree> <branch1> <branch2>
DESCRIPTION
Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way git 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 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.
GIT
Part of the git(1) suite Git 1.8.5.3 01/14/2014 GIT-MERGE-TREE(1)
Related Man Pages
git-merge-file(1) - linux
git-merge-index(1) - linux
git-merge-base(1) - centos
git-write-tree(1) - suse
git-merge-index(1) - mojave
Similar Topics in the Unix Linux Community
User Guide: Posting in the Emergency Forum
Please Donate to the Red Cross for Earthquake and Tsunami Relief in Japan
Merry Christmas!
UNIX.com End of Year (EOY) Report (2019)