summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPaul Bolle <pebolle@tiscali.nl>2009-08-11 13:03:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-12 23:14:32 (GMT)
commit22f1fb66be859fb5ab1620a7dce8e54702d4a07c (patch)
tree21b2e2e18d39c5797e08f16470b5b97af6f4b32d /Documentation
parent0b74f5dc3a27a058cd5dfe45b5ada4d2853dc447 (diff)
downloadgit-22f1fb66be859fb5ab1620a7dce8e54702d4a07c.zip
git-22f1fb66be859fb5ab1620a7dce8e54702d4a07c.tar.gz
git-22f1fb66be859fb5ab1620a7dce8e54702d4a07c.tar.bz2
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.txt2
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