From: Paul Bolle <pebolle@tiscali.nl>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH] [TRIVIAL] Documentation: merge: one <remote> is required
Date: Tue, 11 Aug 2009 15:03:58 +0200 [thread overview]
Message-ID: <1249995838.1589.3.camel@localhost.localdomain> (raw)
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
next reply other threads:[~2009-08-11 13:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-11 13:03 Paul Bolle [this message]
2009-08-11 14:42 ` [PATCH] Re: [TRIVIAL] Documentation: merge: one <remote> is required Nicolas Sebrecht
2009-08-11 14:58 ` Paul Bolle
2009-08-12 2:48 ` Junio C Hamano
2009-08-12 10:19 ` Jakub Narebski
2009-08-12 13:29 ` Nicolas Sebrecht
2009-08-12 10:56 ` Paul Bolle
2009-08-12 20:31 ` Junio C Hamano
2009-08-12 20:47 ` Paul Bolle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1249995838.1589.3.camel@localhost.localdomain \
--to=pebolle@tiscali.nl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.