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

Re: Recording cherry-picked commits

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 23, 2008, 00:37 UTC
Message-ID
<7veja2gts9.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@mail.gmail.com>
"Rafael Garcia-Suarez" <rgarciasuarez@gmail.com> writes:
Show 6 quoted lines
> Here's an alternate idea: store the original sha1 in the commit
> message, via a custom header (something like X-Cherry-Picked-From) at
> least in case of conflict, and have git-cherry recognize it.
>
> (I have the same problem as you, by the way, and would really like to
> see it solved one way or another.)
"-x"?
Previous: Rafael Garcia-SuarezNext: Jean-Baptiste Quenot
Message 4 of 8 in “Recording cherry-picked commits”
  1. Jean-Baptiste QuenotMar 21, 2008
  2. Jean-Baptiste QuenotMar 22, 2008
  3. Rafael Garcia-SuarezMar 22, 2008
  4. Junio C HamanoMar 23, 2008
  5. Jean-Baptiste QuenotMar 23, 2008
  6. Johannes SchindelinMar 23, 2008
  7. Rafael Garcia-SuarezMar 23, 2008
  8. Johannes SchindelinMar 23, 2008

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.