[thirdparty/git.git] / Documentation / 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
Commit	Line	Data
	1	git-merge-tree(1)
	2	=================
	3
	4	NAME
	5	----
	6	git-merge-tree - Show three-way merge without touching index
	7
	8
	9	SYNOPSIS
	10	--------
	11	[verse]
	12	'git merge-tree' <base-tree> <branch1> <branch2>
	13
	14	DESCRIPTION
	15	-----------
	16	Reads three tree-ish, and output trivial merge results and
	17	conflicting stages to the standard output. This is similar to
	18	what three-way 'git read-tree -m' does, but instead of storing the
	19	results in the index, the command outputs the entries to the
	20	standard output.
	21
	22	This is meant to be used by higher level scripts to compute
	23	merge results outside of the index, and stuff the results back into the
	24	index. For this reason, the output from the command omits
	25	entries that match the <branch1> tree.
	26
	27	GIT
	28	---
	29	Part of the linkgit:git[1] suite