@matheusbsbs / matheus-bagliano / commits / 22f1fb66be
Fork 0

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>

Paul Bolle committed Aug 11, 2009 at 15:03 UTC 22f1fb66be859fb5ab1620a7dce8e54702d4a07c
1 file changed +1 -1
Documentation/git-merge.txt
+1 -1
@@ -10,7 +10,7 @@ SYNOPSIS
10 --------
11 [verse]
12 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
13 - [-m <msg>] <remote> <remote>...
13 + [-m <msg>] <remote>...
14 'git merge' <msg> HEAD <remote>...
15
16 DESCRIPTION