Skip to content

Commit

Permalink
Documentation: merge: one <remote> is required
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Bolle authored and Junio C Hamano committed Aug 12, 2009
1 parent 0b74f5d commit 22f1fb6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Documentation/git-merge.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 22f1fb6

Please sign in to comment.