summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorAbhijit Menon-Sen <ams@toroid.org>2008-07-30 15:03:43 +0530
committerJunio C Hamano <gitster@pobox.com>2008-07-30 21:42:55 -0700
commitf448e24e2fe336621306b04b84e947bdd04f7ecc (patch)
tree79dc4b59a73f33180cc138a1c2115006f7579c10 /Documentation/git-merge.txt
parent0e25790f1d9cbbcac5dc6fbcea3096c3590f45d7 (diff)
downloadgit-f448e24e2fe336621306b04b84e947bdd04f7ecc.tar.gz
Make the DESCRIPTION match <x>... items in the SYNOPSIS
When the SYNOPSIS says e.g. "<path>...", it is nice if the DESCRIPTION also mentions "<path>..." and says the specified "paths" (note plural) are used for $whatever. This fixes the obvious mismatches. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 2db8880989..17a15acb07 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -32,8 +32,8 @@ include::merge-options.txt[]
it is created). The 'git-fmt-merge-msg' script can be used
to give a good default for automated 'git-merge' invocations.
-<remote>::
- Other branch head merged into our branch. You need at
+<remote>...::
+ Other branch heads to merge into our branch. You need at
least one <remote>. Specifying more than one <remote>
obviously means you are trying an Octopus.