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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html