| commit | 456a4c08b8d8ddefda939014c15877ace3e3f499 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Jun 2011 18:40:14 +0000 (6 11:40 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Jun 2011 18:40:14 +0000 (6 11:40 -0700) | ||
| tree | 02e78225fadc62bb3585494b9cb418d833bd8e01 | treesnapshot (tar.gz zip) |
| parent | 6c92972d7f5ab247a8cab5e4b88cb281bf201970 | commitdiff |
| parent | 28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 | commitdiff |
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
* 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 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |
| diff.h | diff1 | diff2 | blobhistory |
| t/t4040-whitespace-status.sh | diff1 | diff2 | blobhistory |
| tree-diff.c | diff1 | diff2 | blobhistory |