Merge branch 'maint'

[git.git] / Documentation / git-merge-tree.txt

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index b785e0f6e0c02ef688d4c6a60e19939aafd1a8d3..f869a7f00fa812bed068f5b60bd970d4dcac0655 100644 (file)
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -8,20 +8,20 @@ git-merge-tree - Show three-way merge without touching index
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-merge-tree' <base-tree> <branch1> <branch2>
+'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
 
 DESCRIPTION
 -----------
 Reads three treeish, and output trivial merge results and
 conflicting stages to the standard output.  This is similar to

-what three-way read-tree -m does, but instead of storing the
+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
 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 index, and stuff the results back into the
+merge results outside of the index, and stuff the results back into the

 index.  For this reason, the output from the command omits
 index.  For this reason, the output from the command omits

-entries that match <branch1> tree.
+entries that match the <branch1> tree.

 
 Author
 ------
 
 Author
 ------