From: Paul Bolle <pebolle@tiscali.nl>
Date: Tue, 11 Aug 2009 13:03:58 +0000 (+0200)
Subject: Documentation: merge: one <remote> is required
X-Git-Tag: v1.6.4.1~10^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=22f1fb66be859fb5ab1620a7dce8e54702d4a07c;p=git.git

Documentation: merge: one <remote> is required

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>
---

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index c04ae739e..af68d694a 100644
--- 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