Thread (11 messages) flat view 11 messages, 4 authors, 2016-06-15

Re: git pull on ia64 linux tree

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:41:55


On Thu, 28 Apr 2005, Petr Baudis wrote:
quoted
(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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help