[PATCH] [TRIVIAL] Documentation: merge: one <remote> is required
- From
- Paul Bolle <pebolle@tiscali.nl>
- Date
- Aug 11, 2009, 13:03 UTC
- Message-ID
- <1249995838.1589.3.camel@localhost.localdomain>
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> --- Documentation/git-merge.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index c04ae73..af68d69 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
-- 1.6.4