From: Junio C Hamano Date: Mon, 06 Jun 2005 06:35:26 GMT Subject: Re: Last mile for 1.0 Message-ID: <7vpsv0uh5d.fsf@assigned-by-dhcp.cox.net> In-Reply-To: >>>>> "LT" == Linus Torvalds writes: LT> And the "git-merge-one-file-script" thing needs to be updated to keep the LT> tree updated as it merges things by hand, since it can't depend on the LT> git-checkout-cache fixing things up any more. Anybody? I'd love to bite. One problem I have been having for the last 30 minutes or so is that t1000 test (merge from h*ll) does not show that read-tree resolving even the trivial ones anymore, and I do not know if you want make it that the responsibility of git-merge-one-file-script, or if it is just an oversight. I might have leave that to Europeans, though, due to timezone differences ;-).