Re: inexplicable failure to merge recursively across cherry-picks

From: martin f krafft <madduck@madduck.net>
Date: Oct 10, 2007, 10:25 UTC
Message-ID: <20071010102528.GB20390@lapse.madduck.net>
In-Reply-To: <alpine.LFD.0.999.0710091926560.3838@woody.linux-foundation.org>

also sprach Linus Torvalds <torvalds@linux-foundation.org> [2007.10.10.0354 +0100]:

> Cherry-picking is immaterial. It doesn't matter how the changes
> come into the tree. It doesn't matter what the history is. The
> only thing git cares about is the content, and the end result.

This is the part I over-estimated. I thought that Git would figure out that commits 1-3 had been merged into the target and thus apply, in sequence, only the commits from the source which had not been merged.

Many thanks (again), Linus! Looking forward to your next content manager; you know, the one with artificial intelligence built in! You could call it "wit" :)

-- 
martin;              (greetings from the heart of the sun.)
  \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck
 
dies ist eine manuell generierte email. sie beinhaltet
tippfehler und ist auch ohne großbuchstaben gültig.
 
spamtraps: madduck.bogus@madduck.net