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
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00			`git-merge-tree(1)`
			`=================`

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


			`SYNOPSIS`
			`--------`
Documentation: use [verse] for SYNOPSIS sections The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sections for consistency. Also remove the blank lines from git-fetch.txt and git-rebase.txt to align with the other man pages. In the case of git-rebase.txt, which already uses [verse], the blank line makes the [verse] not apply to the last line, so removing the blank line also makes the formatting within the document more consistent. While at it, add single quotes to 'git cvsimport' for consistency with other commands. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2011-07-02 06:38:26 +04:00			`[verse]`
Documentation: be consistent about "git-" versus "git " Since the git-* commands are not installed in $(bindir), using "git-command <parameters>" in examples in the documentation is not a good idea. On the other hand, it is nice to be able to refer to each command using one hyphenated word. (There is no escaping it, anyway: man page names cannot have spaces in them.) This patch retains the dash in naming an operation, command, program, process, or action. Complete command lines that can be entered at a shell (i.e., without options omitted) are made to use the dashless form. The changes consist only of replacing some spaces with hyphens and vice versa. After a "s/ /-/g", the unpatched and patched versions are identical. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-06-30 10:09:04 +04:00			`'git merge-tree' <base-tree> <branch1> <branch2>`
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00
			`DESCRIPTION`
			`-----------`
use 'tree-ish' instead of 'treeish' Replace 'treeish' in documentation and comments with 'tree-ish' to match gitglossary(7). The only remaining instances of 'treeish' are: * variable, function, and macro names * "(also treeish)" in the definition of tree-ish in gitglossary(7) Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2013-09-04 23:04:30 +04:00			`Reads three tree-ish, and output trivial merge results and`
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00			`conflicting stages to the standard output. This is similar to`
Improve language in git-merge.txt and related docs Improve some minor language and format issues like hyphenation, phrases, spacing, word order, comma, attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-12-09 09:23:51 +03:00			`what three-way 'git read-tree -m' does, but instead of storing the`
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00			`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`
Improve language in git-merge.txt and related docs Improve some minor language and format issues like hyphenation, phrases, spacing, word order, comma, attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-12-09 09:23:51 +03:00			`merge results outside of the index, and stuff the results back into the`
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00			`index. For this reason, the output from the command omits`
Improve language in git-merge.txt and related docs Improve some minor language and format issues like hyphenation, phrases, spacing, word order, comma, attributes. Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-12-09 09:23:51 +03:00			`entries that match the <branch1> tree.`
Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-04-13 11:09:54 +04:00
			`GIT`
			`---`
documentation: move git(7) to git(1) As the "git" man page describes the "git" command at the end-user level, it seems better to move it to man section 1. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2008-06-06 11:07:32 +04:00			`Part of the linkgit:git[1] suite`