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 17, 2011, 02:39 UTC
Message-ID
<7v39lhbnzj.fsf@alter.siamese.dyndns.org>
In-Reply-To
<7vaafqay9f.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
> 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.
> ...
So to conclude,...
>> +       cherry-picked from.  This is done only for cherry
>>        picks without conflicts.  Do not use this option if
>>        you are cherry-picking from your private branch because
>>        the information is useless to the recipient.  If on the

... we could just remove the "This is done only for cherry picks without conflicts." We could explain that the user may want to remove the line depending on the nature of the conflict resolution, but I guess it can be left without saying.

Previous: Junio C HamanoNext: Sebastian Schuberth
Message 10 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.