From: jidanni@jidanni.org
To: gitster@pobox.com
Cc: git@vger.kernel.org
Subject: [PATCH] Documentation/git-merge: at least one <remote> not two
Date: Fri, 02 Jan 2009 02:41:08 +0800 [thread overview]
Message-ID: <87d4f6vph7.fsf@jidanni.org> (raw)
Make SYNOPSIS match usage message
Signed-off-by: jidanni <jidanni@jidanni.org>
---
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 f7be584..a3ac828 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.0.6
next reply other threads:[~2009-01-01 18:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-01 18:41 jidanni [this message]
2009-01-01 21:25 ` [PATCH] Documentation/git-merge: at least one <remote> not two Junio C Hamano
2009-01-02 0:25 ` Sitaram Chamarty
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=87d4f6vph7.fsf@jidanni.org \
--to=jidanni@jidanni.org \
--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.