Revision cca4f20edad04decdc268102f9a6ee2e3803bcc7 authored by Junio C Hamano on 24 February 2017, 18:48:10 UTC, committed by Junio C Hamano on 24 February 2017, 18:48:10 UTC
Doc update. * ps/doc-gc-aggressive-depth-update: docs/git-gc: fix default value for `--aggressiveDepth`
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
Computing file changes ...
