From: Linus Torvalds Date: Thu, 28 Apr 2005 01:08:29 GMT Subject: Re: git pull on ia64 linux tree Message-ID: In-Reply-To: <20050428003342.GW22956@pasky.ji.cz> On Thu, 28 Apr 2005, Petr Baudis wrote: > > > (Which is not really nice, because it means that some files get updated > > and others don't, depending on how they were merged, but whatever..) > > We always do checkout-cache -f -a after we do merge-cache, so it should > end up in a consistent state. I agree that for the common case it doesn't really matter, since we'll always update the working directory regardless. It was more of a conceptual complaint. We do everything else purely in the index, so it's a bit confusing that in that intermediate stage _some_ files end up being up-to-date, and others end up not. Linus