git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 1/4] Introduce CHERRY_PICK_HEAD

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Feb 20, 2011, 02:48 UTC
Message-ID
<20110220024826.GB17547@elie>
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:
Show 10 quoted lines
>> 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

Previous: Jay SoffianNext: Junio C Hamano
Message 6 of 17 in “CHERRY_PICK_HEAD”
  1. 0/4 CHERRY_PICK_HEADJay Soffian, Feb 17, 2011
  2. 1/4 Introduce CHERRY_PICK_HEADJay Soffian, Feb 17, 2011
  3. Junio C HamanoFeb 17, 2011
  4. Jonathan NiederFeb 17, 2011
  5. Jay SoffianFeb 20, 2011
  6. Jonathan NiederFeb 20, 2011
  7. Junio C HamanoFeb 20, 2011
  8. Junio C HamanoFeb 17, 2011
  9. Jay SoffianFeb 17, 2011
  10. Jonathan NiederFeb 17, 2011
  11. 2/4 bash: teach __git_ps1 about CHERRY_PICK_HEADJay Soffian, Feb 17, 2011
  12. 3/4 commit.c: replace some literal strings with constantsJay Soffian, Feb 17, 2011
  13. Jonathan NiederFeb 17, 2011
  14. Teach commit about CHERRY_PICK_HEADJay Soffian, Feb 17, 2011
  15. Jonathan NiederFeb 18, 2011
  16. Junio C HamanoFeb 17, 2011
  17. 4/4 Teach commit about CHERRY_PICK_HEADJay Soffian, Feb 17, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.