Configure Git to use Beyond Compare for image diff
Posted
by
Barney
on Super User
See other posts from Super User
or by Barney
Published on 2013-09-10T16:29:06Z
Indexed on
2013/10/22
3:58 UTC
Read the original article
Hit count: 257
Because we work with a number of sprites, the kind of specialised diff views provided by Beyond Compare would be ideal to see which one of 2 versions I'm after when conflicts arise.
I've already configured Git to use Beyond Compare as my primary diff and merge tool as described in their integration guide — it specifically goes into how to configure TortoiseSVN to use it for images, and I've found these articles talking about .gitattributes
in general and how to script interactions from a *nix shell — but it's not obvious to me how I can use the advice provided by these guides to make a simple change that would say "use the default diff & merge bindings for files determined to be images, too".
For the record, I'm doing all this on Windows :P
© Super User or respective owner