mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
7791a1d9b9
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>
29 lines
749 B
Text
29 lines
749 B
Text
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 treeish, 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
|