projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7fe78a c12f82a)
Merge branch 'jv/maint-no-ext-diff'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 03:56:03 +0000 (20:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 03:56:03 +0000 (20:56 -0700)
commit7ccb9459736e9cfcc543229a4ac3e7039e2d54e3
tree25851cbb02b1a08558ce5763cee4617939f7bfb7tree | snapshot
parenta7fe78a8953a1c4d8abcb36f28133078a778b8d2commit | diff
parentc12f82ae631eb07d0ee6a61003754d103025a0b3commit | diff
Merge branch 'jv/maint-no-ext-diff'

"git diff --no-ext-diff" did not output anything for a typechange
filepair when GIT_EXTERNAL_DIFF is in effect.

* jv/maint-no-ext-diff:
  diff: test precedence of external diff drivers
  diff: correctly disable external_diff with --no-ext-diff
diff.c diff1 | diff2 | blob | history
t/t4020-diff-external.sh diff1 | diff2 | blob | history
Git—the stupid content tracker