From: Jonathan Nieder <jrnieder@gmail.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Ævar Arnfjörð" <avarab@gmail.com>
Subject: Re: [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD
Date: Sat, 19 Feb 2011 20:48:26 -0600 [thread overview]
Message-ID: <20110220024826.GB17547@elie> (raw)
In-Reply-To: <AANLkTik7cfihdu5-0pvgkq1u7kVShEqnjzh07T+5pU16@mail.gmail.com>
Hi,
Jay Soffian wrote:
> On Thu, Feb 17, 2011 at 3:01 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Micronit: "Please, commit your changes before you can merge."
>>
>> - We are not merging in this codepath to begin with;
>>
>> - I'd suggest rephrasing this (together with "MERGE_HEAD" codepath) to
>> something like:
>>
>> "Commit your changes first before retrying."
>
> This hunk is from Jonathan
I agree with what Jay said --- this is in cmd_merge, so the current
message is correct. I like your wording ("before retrying") more, but
that seems orthogonal to the topic at hand. I can send a patch
rephrasing it on top if someone reminds me.
> Okay. In that case, I think when using --no-commit, we shouldn't write
> CHERRY_PICK_HEAD regardless of whether there is a conflict or not.
Thanks for your attention to detail.
Jonathan
next prev parent reply other threads:[~2011-02-20 2:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 4:18 [PATCH v3 0/4] CHERRY_PICK_HEAD Jay Soffian
2011-02-17 4:18 ` [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD Jay Soffian
2011-02-17 20:01 ` Junio C Hamano
2011-02-17 22:32 ` Jonathan Nieder
2011-02-20 2:29 ` Jay Soffian
2011-02-20 2:48 ` Jonathan Nieder [this message]
2011-02-20 6:43 ` Junio C Hamano
2011-02-17 21:56 ` Junio C Hamano
2011-02-17 22:42 ` Jay Soffian
2011-02-17 22:48 ` Jonathan Nieder
2011-02-17 4:18 ` [PATCH v3 2/4] bash: teach __git_ps1 about CHERRY_PICK_HEAD Jay Soffian
2011-02-17 4:18 ` [PATCH v3 3/4] commit.c: replace some literal strings with constants Jay Soffian
2011-02-17 5:19 ` Jonathan Nieder
2011-02-17 5:50 ` [PATCH] Teach commit about CHERRY_PICK_HEAD Jay Soffian
2011-02-18 0:29 ` Jonathan Nieder
2011-02-17 5:49 ` [PATCH v3 3/4] commit.c: replace some literal strings with constants Junio C Hamano
2011-02-17 4:18 ` [PATCH v3 4/4] Teach commit about CHERRY_PICK_HEAD Jay Soffian
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=20110220024826.GB17547@elie \
--to=jrnieder@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@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).