From: Jeff King Date: Thu, 13 May 2010 11:51:58 GMT Subject: Re: Advice on choosing git Message-ID: <20100513115158.GB10963@coredump.intra.peff.net> In-Reply-To: On Thu, May 13, 2010 at 01:42:58PM +0200, Matthieu Moy wrote: > Joe Brenner writes: > > > You won't get any benefit out of things like "git diff" either. The > > diffs we have (these days at least) don't work well on anything but plain > > text. > > Not totally true. textconv filter is just great when working when > word-processors (with the filter being odt2txt or antiword). I agree. Whoever wrote the textconv code was a genius. ;) But I did want to note that textconv is just _one_ way of seeing the data. You can also have git invoke custom diff and merge handlers. I haven't tried it, but I suspect you may be able to drive the interactive graphical versioning found in many word processors. I thought somebody had done some work on this, but I can't seem to dig up a link. -Peff