| commit | 61af494ca4e63cdc484ea091617ab5f3974f2f9c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 17:58:41 +0000 (26 09:58 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Nov 2008 17:58:41 +0000 (26 09:58 -0800) | ||
| tree | 5c8b00bf07ef002926f667852c5e48ef6bb3f6df | treesnapshot (tar.gz zip) |
| parent | 37a7744ffe31af785571858f7341d588a6c66784 | commitdiff |
Teach "git diff" to honour --[no-]ext-diff
The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30)
was to optionally allow the use of external diff viewer in "git log"
family (while keeping them disabled by default). It exposed the "allow
external diff" bit to the UI, but forgot to adjust the "git diff" codepath
that was set up to always allow use of the external diff viewer.
Noticed by Nazri Ramliy; tests by René Scharfe squashed in.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The original intention of 72909be (Add diff-option --ext-diff, 2007-06-30)
was to optionally allow the use of external diff viewer in "git log"
family (while keeping them disabled by default). It exposed the "allow
external diff" bit to the UI, but forgot to adjust the "git diff" codepath
that was set up to always allow use of the external diff viewer.
Noticed by Nazri Ramliy; tests by René Scharfe squashed in.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-diff.c | diffblobblamehistory | |
| t/t4020-diff-external.sh | diffblobblamehistory |