projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c92972 28b9264)
Merge branch 'jk/diff-not-so-quick'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:14 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:14 +0000 (11:40 -0700)
commit456a4c08b8d8ddefda939014c15877ace3e3f499
tree02e78225fadc62bb3585494b9cb418d833bd8e01tree | snapshot
parent6c92972d7f5ab247a8cab5e4b88cb281bf201970commit | diff
parent28b9264dd6cbadcef8b3e48c24ffcb2893b668b3commit | diff
Merge branch 'jk/diff-not-so-quick'

* jk/diff-not-so-quick:
  diff: futureproof "stop feeding the backend early" logic
  diff_tree: disable QUICK optimization with diff filter

Conflicts:
diff.c
diff-lib.c diff1 | diff2 | blob | history
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
t/t4040-whitespace-status.sh diff1 | diff2 | blob | history
tree-diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker