From: Karl Hasselström <kha@treskal.com>
Date: Wed, 29 Aug 2007 13:14:39 GMT
Subject: Re: Mixing cherry-pick and merge
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