diff options
| author |  Paul Bolle <pebolle@tiscali.nl> | 2009-08-11 15:03:58 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:14:32 -0700 |
| commit | 22f1fb66be859fb5ab1620a7dce8e54702d4a07c (patch) | |
| tree | 21b2e2e18d39c5797e08f16470b5b97af6f4b32d /Documentation | |
| parent | help.c: give correct structure's size to memset() (diff) | |
| download | tgif-22f1fb66be859fb5ab1620a7dce8e54702d4a07c.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | 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 c04ae739ed..af68d694a0 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 |