On Tue, Feb 12, 2008 at 03:58:53PM -0800, David Miller wrote: > From: Jeff Garzik <[EMAIL PROTECTED]> > Date: Tue, 12 Feb 2008 11:36:24 -0500 > > > Rebasing is low impact only if you don't have git downstream people. > > Otherwise, you're just treating it as a useful quilt clone, really. > > Understood. > > One of the key operations that I'm interested in is removing things > from the history. If I could do that using GIT without any side > effects and in a way that really would remove it from the tree, I > would do that in a heartbeat. > > At 1500 changesets, a merge conflict shows up about once > every day or two as 2.6.N nears it's release into final > as bug fixes trickle in. > > I find using GIT to fixup merge errors on a tree of that > scale to be really painful. And it only fixes up the final > result in a merge changeset.
Perhaps you need to switch to using quilt. This is the main reason why I use it. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
