From: Jared Hance <jaredhance@gmail.com>
To: git@vger.kernel.org
Cc: Jared Hance <jaredhance@gmail.com>
Subject: [PATCH v4 2/5] merge: update the usage information to be more modern
Date: Thu, 10 Feb 2011 18:40:04 -0500 [thread overview]
Message-ID: <1297381209-6377-5-git-send-email-jaredhance@gmail.com> (raw)
In-Reply-To: <1297381209-6377-1-git-send-email-jaredhance@gmail.com>
Apparantly, merge's usage information was outdated and used old terminology.
Fix it.
Signed-off-by: Jared Hance <jaredhance@gmail.com>
---
builtin/merge.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 42fff38..439d2c7 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -37,8 +37,8 @@ struct strategy {
};
static const char * const builtin_merge_usage[] = {
- "git merge [options] <remote>...",
- "git merge [options] <msg> HEAD <remote>",
+ "git merge [options] <branch>...",
+ "git merge [options] <msg> HEAD <branch>",
NULL
};
--
1.7.4
next prev parent reply other threads:[~2011-02-10 23:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 23:40 [PATCH v4 0/4] Updated patch series for default upstream merge Jared Hance
2011-02-10 23:40 ` [PATCH v4 1/4] merge: update the usage information to be more modern Jared Hance
2011-02-10 23:40 ` [PATCH v4 1/5] t5526: Fix wrong argument order in "git config" Jared Hance
2011-02-10 23:40 ` [PATCH v4 2/4] merge: introduce setup_merge_commit helper function Jared Hance
2011-02-10 23:40 ` Jared Hance [this message]
2011-02-10 23:40 ` [PATCH v4 3/4] merge: introduce per-branch-configuration " Jared Hance
2011-02-10 23:40 ` [PATCH v4 3/5] merge: introduce setup_merge_commit " Jared Hance
2011-02-10 23:40 ` [PATCH v4 4/4] merge: add support for merging from upstream by default Jared Hance
2011-02-11 7:37 ` Bert Wesarg
2011-02-10 23:40 ` [PATCH v4 4/5] merge: introduce per-branch-configuration helper function Jared Hance
2011-02-10 23:40 ` [PATCH v4 5/5] merge: add support for merging from upstream by default Jared Hance
2011-02-10 23:47 ` [PATCH v4 0/4] Updated patch series for default upstream merge Jared Hance
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=1297381209-6377-5-git-send-email-jaredhance@gmail.com \
--to=jaredhance@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).