From: Matthieu Moy Date: Wed, 06 Oct 2010 20:40:12 GMT Subject: Re: textconv not used for diff Message-ID: In-Reply-To: Victor Engmark writes: > Hello, > > After trying for a couple hours to get textconv to work according to > and other pages, I've > given up. I've tried changing .odt, .ott and .ods files, but git-diff > never outputs the text diff: > > $ git --version > git version 1.7.0.4 > $ cat ~/.gitattributes .gitattributes file should be in the working tree, not in your $HOME. The development version of Git has a core.attributesfile variable that would allow you to have a user-wide ~/.gitattributes, but this isn't released yet. -- Matthieu Moy http://www-verimag.imag.fr/~moy/