Re: Last mile for 1.0
- From
Junio C Hamano <junkio@cox.net>
- Date
- Jun 6, 2005, 07:05 UTC
- Message-ID
- <7vekbgufra.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <Pine.LNX.4.58.0506052351470.1876@ppc970.osdl.org>
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
LT> Not exactly. It updates the index directly, without necessarily updating LT> the working directory. For example:
LT> "$1.." | "$1.$1" | "$1$1.") LT> echo "Removing $4" LT> exec git-update-cache --force-remove "$4" ;;
LT> it _says_ "removing $4", but it never actually does so, so the working LT> directory still has the file ;)
Yes, this was done from your explicit request not to touch the working directory while it works AFAICR. At least back then, not touching the working tree was the _requirement_.
So is "the new merge world order" you mentioned in the log message now require (and assume) the work tree more-or-less matches the first head being merged?