Re: : Networking
- From
Linus Torvalds <torvalds@osdl.org>
- Date
- Apr 26, 2005, 20:11 UTC
- Message-ID
- <Pine.LNX.4.58.0504261310120.18901@ppc970.osdl.org>
- In-Reply-To
- <20050426125141.6ec38d31.akpm@osdl.org>
On Tue, 26 Apr 2005, Andrew Morton wrote:
> > With bk I was resolving that by just smashing the patches on top of each > other, ignoring the rejects and refreshing the topmost patch. That > approach actually resolved this linus-vs-davem dupe as well.
Oh, wow. I didn't realize that your scripts were quite _that_ stupid, and didn't actually take advantage of any automatic merges at all.
If so, git should trivially do everything that BK ever did for you. Which is not saying a lot ;)
Linus