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

Re: [PATCH] git-cherry-pick -x works with conflicting commits

From
RGRafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date
Mar 24, 2008, 14:52 UTC
Message-ID
<b77c1dce0803240752s29e611aay55c4021741de598a@mail.gmail.com>
In-Reply-To
<ae63f8b50803240655k5d6413e5s8d6ceebca462370f@mail.gmail.com>
On 24/03/2008, Jean-Baptiste Quenot <jbq@caraldi.com> wrote:
> When I'm using "git commit -c <id>" as suggested by git-cherry-pick
>  upon conflict, I do not get the mention "(cherry picked from commit
>  <id>)", at least with version 1.5.4.1.  How did you get it?

I use the most recent git from master, and simply do git-add and git-commit without arguments after having resolving the conflict. The commit message in MERGE_MSG, that I checked, does have the "cherry picked from commit <id>" mention (before the conflict list).

Previous: Jean-Baptiste QuenotNext: Jean-Baptiste Quenot
Message 3 of 4 in “git-cherry-pick -x works with conflicting commits”
  1. git-cherry-pick -x works with conflicting commitsRafael Garcia-Suarez, Mar 24, 2008
  2. Jean-Baptiste QuenotMar 24, 2008
  3. Rafael Garcia-SuarezMar 24, 2008
  4. Jean-Baptiste QuenotMar 24, 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.