* textconv not used for diff
@ 2010-10-06 20:36 Victor Engmark
2010-10-06 20:40 ` Matthieu Moy
0 siblings, 1 reply; 3+ messages in thread
From: Victor Engmark @ 2010-10-06 20:36 UTC (permalink / raw)
To: git
Hello,
After trying for a couple hours to get textconv to work according to
<https://git.wiki.kernel.org/index.php/Textconv> 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
*.odp diff=odf
*.ods diff=odf
*.odt diff=odf
*.ott diff=odf
$ cat ~/.gitconfig
...
[diff "odf"]
textconv = odt2txt
$ odt2txt budget.ods
[produces useful output]
$ git diff
diff --git a/budget.ods b/budget.ods
index 64374b9..c4a1949 100644
Binary files a/budget.ods and b/budget.ods differ
$ git diff --textconv
diff --git a/budget.ods b/budget.ods
index 64374b9..e680dee 100644
Binary files a/budget.ods and b/budget.ods differ
Any ideas?
--
Victor Engmark
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: textconv not used for diff
2010-10-06 20:36 textconv not used for diff Victor Engmark
@ 2010-10-06 20:40 ` Matthieu Moy
2010-10-06 21:10 ` Victor Engmark
0 siblings, 1 reply; 3+ messages in thread
From: Matthieu Moy @ 2010-10-06 20:40 UTC (permalink / raw)
To: Victor Engmark; +Cc: git
Victor Engmark <victor.engmark@gmail.com> writes:
> Hello,
>
> After trying for a couple hours to get textconv to work according to
> <https://git.wiki.kernel.org/index.php/Textconv> 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/
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: textconv not used for diff
2010-10-06 20:40 ` Matthieu Moy
@ 2010-10-06 21:10 ` Victor Engmark
0 siblings, 0 replies; 3+ messages in thread
From: Victor Engmark @ 2010-10-06 21:10 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git
On Wed, Oct 6, 2010 at 10:40 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Victor Engmark <victor.engmark@gmail.com> writes:
>> After trying for a couple hours to get textconv to work according to
>> <https://git.wiki.kernel.org/index.php/Textconv> 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.
Thank you very much! To the point and with bonus info for later. Works a charm.
--
Victor Engmark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-06 21:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-06 20:36 textconv not used for diff Victor Engmark
2010-10-06 20:40 ` Matthieu Moy
2010-10-06 21:10 ` Victor Engmark
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).