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

Re: [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 16, 2011, 17:42 UTC
Message-ID
<7vaafqay9f.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTim2=Jg4QcgKwO=J6343zWAoCkyXZQ@mail.gmail.com>
Jay Soffian <jaysoffian@gmail.com> writes:
Show 6 quoted lines
> Disagree. Here was my thought process (it was a conscious decision):
> after conflict, when the user runs "git commit", the message is
> brought up in the editor, leaving it up to the user to decide whether
> it is appropriate to remove the "cherry-picked from" message. I
> personally think it is correct to keept it, along with the list of
> "Conflicts:".

I agree that the user can decide to remove that line in the editor when the necessary conflict resolution was so extensive that the most part of the original change became irrelevant.

It requires extra work that was unnecessary to the end user before the series, and the series is a regression in that sense. But removing a single extra line is much easier to do than adding the line from scratch, so this particular potential regression is not really a big deal.

Previous: Jay SoffianNext: Junio C Hamano
Message 9 of 11 in “doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes"”
  1. doc: Use the term "remark" in "cherry-pick -x" to disambiguate from "git notes"Sebastian Schuberth, Apr 15, 2011
  2. Junio C HamanoApr 15, 2011
  3. [PATCHv2] doc: Clarify that "cherry-pick -x" does not use "git notes"Sebastian Schuberth, Apr 15, 2011
  4. Jay SoffianApr 15, 2011
  5. Sebastian SchuberthApr 16, 2011
  6. Junio C HamanoApr 16, 2011
  7. Sebastian SchuberthApr 16, 2011
  8. Jay SoffianApr 16, 2011
  9. Junio C HamanoApr 16, 2011
  10. Junio C HamanoApr 17, 2011
  11. Sebastian SchuberthApr 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.