Andrew's git / gitweb.git / diff
?
Documentation: merge: one <remote> is required
authorPaul Bolle <pebolle@tiscali.nl>
Tue, 11 Aug 2009 13:03:58 +0000 (15:03 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2009 23:14:32 +0000 (16:14 -0700)
merge only requires one <remote>, so "<remote>..." should be used in the
synopsis (and not "<remote> <remote>...").

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge.txt patch | blob | history
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c04ae739edd409307d286fe31e6f87e41f977eac..af68d694a0ad8066b05fcc02bae8e57a7c137034 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
-       [-m <msg>] <remote> <remote>...
+       [-m <msg>] <remote>...
 'git merge' <msg> HEAD <remote>...
 
 DESCRIPTION