Merge branch 'jc/maint-diff-q-filter' into next
commitd3d85dc31592cba765b634b7755e1874e58457de
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:30:32 +0000 (20 22:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Mar 2011 05:30:32 +0000 (20 22:30 -0700)
treecb2519f3b2287c424dc96f43cf779cf6f9081eca
parent2917b197ad244af3efa1934fa16268e0d1072a54
parent2cfe8a68ccba86f046080f890102a9a43361cfdd
Merge branch 'jc/maint-diff-q-filter' into next

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