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>
This commit is contained in:
parent
0b74f5dc3a
commit
22f1fb66be
@ -10,7 +10,7 @@ SYNOPSIS
|
|||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
|
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
|
||||||
[-m <msg>] <remote> <remote>...
|
[-m <msg>] <remote>...
|
||||||
'git merge' <msg> HEAD <remote>...
|
'git merge' <msg> HEAD <remote>...
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
|
Loading…
Reference in New Issue
Block a user