From: David Aguilar Date: Sat, 21 Jul 2012 05:10:53 GMT Subject: Re: [PATCH v2] difftool: only copy back files modified during directory diff Message-ID: In-Reply-To: <7v394nveni.fsf@alter.siamese.dyndns.org> On Thu, Jul 19, 2012 at 10:34 AM, Junio C Hamano wrote: > David Aguilar writes: > >> Perhaps something like this... > > Yeah, like that ;-). Hmm.. this one was potentially data-losing. Sorry for not catching that in 7e0abcec103b3649943b236881cf88e8fd6cf3a4. $ git tag --contains 7e0abcec103b3649943b236881cf88e8fd6cf3a4 v1.7.11 v1.7.11.1 v1.7.11.2 maint, please? I don't like complexity either, but adding a --symlinks option (and making it the default) to create symlinks instead of copies really does seem like the way to go long-term. Then we can avoid the whole copy-back business when in this mode. I'll start exploring this unless you beat me to it, Tim ;-) -- David