On Tue, 19 Apr 2005, Petr Baudis wrote: > > What is actually a little annoying is having to cd ,,merge and then > back, though. I don't know, but the current pull-merge script does not > bother with the temporary merge directory neither, even though Linus > wanted it. Linus, do you still do? ;-)
No, now that the merge is done entirely in the index file, I don't care any more. The index file _is_ the temporary directory as far as I'm concerned. Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html