From: Andreas Schwab <schwab@linux-m68k.org>
To: Jared Hance <jaredhance@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Add support for merging from upstream by default.
Date: Sat, 05 Feb 2011 11:03:09 +0100 [thread overview]
Message-ID: <m2k4he23z6.fsf@whitebox.home> (raw)
In-Reply-To: <1296866721-27818-1-git-send-email-jaredhance@gmail.com> (Jared Hance's message of "Fri, 4 Feb 2011 19:45:21 -0500")
Jared Hance <jaredhance@gmail.com> writes:
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 42fff38..a69b69f 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -37,6 +37,7 @@ struct strategy {
> };
>
> static const char * const builtin_merge_usage[] = {
> + "git merge",
Doesn't that form take options as well?
> "git merge [options] <remote>...",
IOW, how about changing that to
"git merge [options] [<remote>...]",
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2011-02-05 10:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-05 0:45 [PATCH] Add support for merging from upstream by default Jared Hance
2011-02-05 10:03 ` Andreas Schwab [this message]
2011-02-05 13:31 ` Jared Hance
2011-02-07 1:59 ` Junio C Hamano
2011-02-07 9:36 ` Bert Wesarg
2011-02-07 9:43 ` Bert Wesarg
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=m2k4he23z6.fsf@whitebox.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=jaredhance@gmail.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 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).