On Sat, Aug 23, 2008 at 11:24:52AM +0200, Paolo Bonzini wrote: > Andi Kleen wrote: > >> Exactly. Don't rebase. And don't base your development on somebody who > >> does. > > > > That's pretty much impossible in the current state of Linux development > > as far as I know. > > > >> Remember how I told you that you should never rebase? > > > > I suspect your recommendation does not match real world git use. > > I think if you have to rebase often, you're actually better off using [ ] You read my original email. The issue is not that I'm rebasing [1], but that other people I'm updating trees from are rebasing all the time. And Linus and the others can say "don't rebase" all the time -- that doesn't change the fact thato others are rebasing anyways. And git's support for dealing with that seems to be quite poor. -Andi [1] Ok I do it occasionally, but that's not the problem here, and I don't have a real user base for my trees and the branches I'm doing that on. -- 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