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
Jay Soffian <jaysoffian@gmail.com>
Date
Apr 15, 2011, 22:22 UTC
Message-ID
<BANLkTi=HecmdGbEX5inqUi4FZ5Ty+L1Ybg@mail.gmail.com>
In-Reply-To
<4DA8862F.5070102@gmail.com>

On Fri, Apr 15, 2011 at 1:53 PM, Sebastian Schuberth <sschuberth@gmail.com> wrote:

Show 26 quoted lines
> The documentation for "cherry-pick -x" could be misread in the way that a
> "git notes" object is attached to the new commit, which is not the case.
>
> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
> ---
>  Documentation/git-cherry-pick.txt |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
> index 01db830..9d8fe0d 100644
> --- a/Documentation/git-cherry-pick.txt
> +++ b/Documentation/git-cherry-pick.txt
> @@ -51,9 +51,10 @@ OPTIONS
>        message prior to committing.
>
>  -x::
> -       When recording the commit, append to the original commit
> -       message a note that indicates which commit this change
> -       was cherry-picked from.  Append the note only for cherry
> +       When recording the commit, append a line that says
> +       "(cherry picked from commit ...)" to the original commit
> +       message in order to indicate which commit this change was
> +       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

As long as you're nearby, "This is done only for cherry picks without conflicts." can be dropped. It's no longer true.

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