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

Re: Recording cherry-picked commits

From
RGRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date
Mar 22, 2008, 22:48 UTC
Message-ID
<b77c1dce0803221548x3250cb90taa9a9d53464f7ea7@mail.gmail.com>
In-Reply-To
<ae63f8b50803220937k78571fbdl1eeb60966ec7aa40@mail.gmail.com>
On 22/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> What about using a hidden ".gitcherry" file in the current branch to
>  store the commits that have been applied?  With the simple shell
>  scripts below I'm able to achieve the same effect as svnmerge:

(.gitcherry should really be at the root of the git repository, not in the current directory)

What happens to .gitcherry across merges ? I think your solution isn't robust enough.

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.)

Previous: Jean-Baptiste QuenotNext: Junio C Hamano
Message 3 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.