summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2008-12-09 06:23:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-10 04:57:52 (GMT)
commit29b802aae6213d02879d21aabac1a8d2e035b583 (patch)
tree341c1efeb55daaca255cd58a11386ebdeb9b3d7f /Documentation/git-merge-tree.txt
parent9c0c1b1f28e27bf4ac8a7b13f0b0ed3eaebc8cff (diff)
downloadgit-29b802aae6213d02879d21aabac1a8d2e035b583.zip
git-29b802aae6213d02879d21aabac1a8d2e035b583.tar.gz
git-29b802aae6213d02879d21aabac1a8d2e035b583.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
-rw-r--r--Documentation/git-merge-tree.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index dbb0c18..f869a7f 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -14,14 +14,14 @@ 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
-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
-entries that match <branch1> tree.
+entries that match the <branch1> tree.
Author
------