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

Mixing cherry-pick and merge

From
MMMichel Marti <mma@objectxp.com>
Date
Aug 29, 2007, 12:05 UTC
Message-ID
<46D56123.4030307@objectxp.com>

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?

Steps to reproduce:

mkdir foo && cd foo git init echo 123 >file git add file git commit -m "init" git checkout -b branch echo 321 >file git commit -a -m "commit from branch" => Created commit 531fa08: commit from branch git checkout master git cherry-pick 531fa08 git merge branch git-log --pretty=oneline e5e8011c1ab7c9b8509604d27327b29fd1f7003a Merge branch 'branch' ad91b39e433228809eb3cd6281cb686bf4871da0 commit from branch 531fa081d93249288efb70e9e8204e4ed9d70099 commit from branch bc0a5bca29620eccd5b75e473d102317d8ce29f7 init

Next: Karl Hasselström
Message 1 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.