Merge branch 'jc/maint-diff-q-filter'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 21:55:17 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Mar 2011 21:55:17 +0000 (14:55 -0700)
commit7d0cf357a31cc8a442342696788d776265482ce9
tree9b5eb5adb7a70fb7f2aef1af23b06a9a83855c17
parent98b256bd0857ab2192fdad27c26edbb0df3d96d1
parent2cfe8a68ccba86f046080f890102a9a43361cfdd
Merge branch 'jc/maint-diff-q-filter'

* jc/maint-diff-q-filter:
  diff --quiet: disable optimization when --diff-filter=X is used
diff-lib.c
t/t4040-whitespace-status.sh