Merge branch 'jc/maint-diff-q-filter' into maint
commitbcf3d1fd9ccc04350d793c077d3c112fb26f43f0
authorJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:23:34 +0000 (1 16:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 1 Apr 2011 23:23:34 +0000 (1 16:23 -0700)
tree94ec20c8619ff467915f659f7803c56745393613
parentbf87e09325f250ded42e1b2a024beb1a52f0d483
parent2cfe8a68ccba86f046080f890102a9a43361cfdd
Merge branch 'jc/maint-diff-q-filter' into maint

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