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

Re: Mixing cherry-pick and merge

From
Karl Hasselström <kha@treskal.com>
Date
Aug 29, 2007, 13:14 UTC
Message-ID
<20070829131439.GA31212@diana.vm.bytemark.co.uk>
In-Reply-To
<46D56123.4030307@objectxp.com>
On 2007-08-29 14:05:55 +0200, Michel Marti wrote:
> I just merged from a branch from which I previously cherry-picked
> some commits and now the log contains the already cherry-picked
> commits twice (which is rather confusing). Is this a bug or a
> feature?

It's an inevitable consequence of git's design. When you cherry-pick a commit, you create a (maybe slightly modified) copy of it with different ancestry. If you then merge a branch that contains the original commit, you will get both the original and the copy as ancestors of your new merge commit.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
Previous: Michel MartiNext: Johannes Schindelin
Message 2 of 3 in “Mixing cherry-pick and merge”
  1. Michel MartiAug 29, 2007
  2. Karl HasselströmAug 29, 2007
  3. Johannes SchindelinAug 29, 2007

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.