From: Matt McCutchen Date: Thu, 30 Mar 2006 21:50:59 GMT Subject: Re: How to switch kernel customizations from 2.6.15.6 to 2.6.16? Message-ID: <1143755459.2487.12.camel@mattlaptop.metaesthetics.net> In-Reply-To: On Thu, 2006-03-30 at 09:32 -0800, Linus Torvalds wrote: > The beauty of git should be (and maybe that's not entirely true simply > because of practical concerns) that there really need not be any notion of > "more official". I understand this, and it is one of several reasons why I prefer git to other version control systems. However, I thought there would be a single official kernel repository even if git didn't require it. Junio explained to me that both yours and the stable one are official for different purposes. I think I will use the stable one because it is current enough for my needs. > - the more fundamental one is that when you start mixing branches, you > have to be very careful if you expect the upstream projects to pull the > changes _back_. [...] True. It might help several branches coordinate development if a commit could be marked as "equivalent" to another commit so that, if both were involved in a merge, one could be thrown out. -- Matt McCutchen hashproduct@verizon.net http://hashproduct.metaesthetics.net/