Hi, On Wed, 29 Aug 2007, Karl Hasselstr?m wrote: > 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. I guess that people are not even aware that they can rebase with Git. Sounds like a perfect use case to me. Ciao, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
