Re: Git and OpenDocument (OpenOffice.org) files

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Aug 27, 2007, 10:17 UTC
Message-ID: <Pine.LNX.4.64.0708271109560.28586@racer.site>
In-Reply-To: <vpqk5rh5mp5.fsf@bauges.imag.fr>

Hi,

On Mon, 27 Aug 2007, Matthieu Moy wrote:

> I found a way to use git comfortably with OpenDocument files (that is, 
> what OpenOffice.org and Koffice produce. Text, Presentations and 
> Spreadsheets).

Heh. I had that problem, too. I added an attribute "*.odt diff=odt" and the diff driver unpacks the zip and executes an xmldiff on the files. Since at times, it is more interesting to do a word based diff, depending on the environment variable WORDDIFF, my diff driver executes "git diff --color-words" instead.

Ciao, Dscho