git-merge-tree - way merge without touching index
git merge-tree <base-tree> <branch1> <branch2>
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 ATTRIBUTES See attributes(5) for descriptions of the following attributes: +---------------+--------------------------+ |ATTRIBUTE TYPE | ATTRIBUTE VALUE | +---------------+--------------------------+ |Availability | developer/versioning/git | +---------------+--------------------------+ |Stability | Uncommitted | +---------------+--------------------------+ NOTES This software was built from source available at https://java.net/projects/solaris-userland. The original community source was downloaded from https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.xz Further information about this software can be found on the open source community website at http://git-scm.com/. Git 2.7.4 03/17/2016 GIT-MERGE-TREE(1)