Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > Does the series in any way change whether plumbing and porcelain invoke > the external diff drivers? I have this particular use-case, which I'd like > that still works: > > - In .git/info/attributes I have specified a diff driver: > > *.doc diff=docdiff > > The driver runs a script that literally loads the two version of the > file into MS Word and uses Word's diffing capability. > > - git-gui should not use the diff driver. That is, plumbing should bypass > the diff driver and say "Binary files differ". [*] Actually, I understand you don't want git gui and gitk to load MS-Word anytime you click something, but I'd love to see the textconv+diff in gitk. (yeah, that's pretty hard to specify right, the ideal requirement seems to be "in a gui, use the good part of the diff driver, but not the other" :-\). -- Matthieu -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
