提交 22f1fb66 编写于 作者: P Paul Bolle 提交者: Junio C Hamano

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: NPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 0b74f5dc
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册