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, 16:33 UTC
Message-ID
<7vk4eub1g9.fsf@alter.siamese.dyndns.org>
In-Reply-To
<BANLkTi=jr0hkmBUGj7tHURSj5XiJkyyQqg@mail.gmail.com>
Sebastian Schuberth <sschuberth@gmail.com> writes:
> How can this be not true anymore? If you get a conflict while picking,
> you're asked to resolve the conflict and then commit via "git commit
> -c <picked_sha1>". Doing so will *not* give you the mentioned "(cherry
> picked from commit ...)" line.

I suspect Jay had the recent CHERRY_PICK_HEAD series that lets you omit saying "-c <picked>" in mind. We should not leave the cherry-picked from in such a case, I think, but the new code may be buggy.

Previous: Sebastian SchuberthNext: Sebastian Schuberth
Message 6 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.