]> git.ipfire.org Git - thirdparty/git.git/commit - diff.c
Add diff-option --ext-diff
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Sat, 30 Jun 2007 17:47:07 +0000 (18:47 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Jul 2007 02:05:55 +0000 (19:05 -0700)
commit72909befaa043fcc975115bb56d25a6e7dc65fb6
tree6c0373991554e7fe72e9ec201be3a707ddb67e24
parentc401b33c349beaf4c218c6441c3e2b58a958de6f
Add diff-option --ext-diff

To prevent funky games with external diff engines, git-log and
friends prevent external diff engines from being called. That makes
sense in the context of git-format-patch or git-rebase.

However, for "git log -p" it is not so nice to get the message
that binary files cannot be compared, while "git diff" has no
problems with them, if you provided an external diff driver.

With this patch, "git log --ext-diff -p" will do what you expect,
and the option "--no-ext-diff" can be used to override that
setting.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-options.txt
diff.c