projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b67f56 c12f82a)
Merge branch 'jv/maint-no-ext-diff' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:59 +0000 (13:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:59 +0000 (13:04 -0700)
commit70f6be7aa9a1f435d64df11ec92ff84982bfc581
treeb224954a0348a3e3efcf07e67b752157938755cftree | snapshot
parent9b67f560f473ec84c9ea77a1fa6378bc7cc29d9dcommit | diff
parentc12f82ae631eb07d0ee6a61003754d103025a0b3commit | diff
Merge branch 'jv/maint-no-ext-diff' into maint

"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