Merge branch 'maint'

* maint: Documentation: git diff --check respects core.whitespace

Junio C Hamano committed Jun 22, 2011 at 14:01 UTC def98035d00c57bb8723e7859366536504eb56aa

No changes.