diff --git a/.gitconfig b/.gitconfig index cd41c4d..2d945c7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,6 @@ [user] name = Mathieu Maret - email = mathieu.maret@openwide.fr + email = mathieu.maret@gmail.com [color] ui = auto diff = auto @@ -15,3 +15,5 @@ co = checkout [diff "odf"] textconv=odt2txt +[diff "odt"] + textconv=odt2txt