9

git diff takes into account my textconv driver, but git difftool -d --textconv does not. Why? How to fix it?

My ~/.gitconfig contains among other settings:

[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[diff "ipynb"]
    textconv = nbcatsrc

And my .gitattributes is:

*.ipynb diff=ipynb
mkrieger1
  • 19,194
  • 5
  • 54
  • 65
user744629
  • 1,961
  • 1
  • 18
  • 27
  • Did you set a particular difftool in your git settings ? – Frodon Apr 27 '15 at 22:59
  • I have a similar problem -- I'm using textconv for ansible vault files, and using `vimdiff` for my diff tool. The textconv driver is used with `git diff`, but not with `git difftool` -- I'm getting a regular binary file diff. – quezak Mar 22 '21 at 11:07
  • 1
    Does this answer your question? [Is git difftool on binaries possible? If so, how does one configure it?](https://stackoverflow.com/questions/34098218/is-git-difftool-on-binaries-possible-if-so-how-does-one-configure-it) – Joshua Goldberg Jun 04 '21 at 16:39

1 Answers1

0

It's true that git difftool ignores textconv. An explanation and workaround is found here:

Is git difftool on binaries possible? If so, how does one configure it?

Joshua Goldberg
  • 5,059
  • 2
  • 34
  • 39