From: Jay Soffian Date: Tue, 24 May 2011 00:59:51 GMT Subject: Re: combined diff does not detect binary files and ignores -diff attribute Message-ID: In-Reply-To: <20110523234934.GC10488@sigill.intra.peff.net> On Mon, May 23, 2011 at 7:49 PM, Jeff King wrote: > Hmm, I thought we did preserve the extension. I think it may actually be > related to me making a fake filespec and not passing the path in. > > Does the (totally untested) patch below fix it for you? Yes. >> 2. It's not really clear to me when one should use textconv vs a >> custom diff driver. (Also, --no-textconv isn't documented...). > > The motivation for textconv was originally a combination of "when you > are too lazy to write a full diff driver" and "when you like how git > formats the diff with pretty colors and word-diff". But now I think we > can add to that: > >  1. When you want something fancy and git-ish like combined diff. > >  2. When you want free caching to speed up repeated log viewing (try >     setting diff.*.cachetextconv to true). Gotcha. > Maybe it is worth adding an "advantages of textconv" section to > gitattributes(5) (the advantage of a full external diff command is that > it can be more flexible, or even graphical in nature). Okay. j.