Staging
v0.8.1
swh:1:snp:c5feb7ee9221a3820c8879e85e8a18470c0b3afa
Raw File
Tip revision: 1fe8f2cf461179c41f64efbd1dc0a9fb3b7a0fb1 authored by Junio C Hamano on 31 October 2016, 20:19:53 UTC
Git 2.11-rc0
Tip revision: 1fe8f2c
git-merge-tree.txt
git-merge-tree(1)
=================

NAME
----
git-merge-tree - Show three-way merge without touching index


SYNOPSIS
--------
[verse]
'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 linkgit:git[1] suite
back to top