summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.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/merge-options.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/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 427cdef..637b53f 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -12,7 +12,7 @@
-n::
--no-stat::
- Do not show diffstat at the end of the merge.
+ Do not show a diffstat at the end of the merge.
--summary::
--no-summary::