Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2011 21:01:18 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2011 21:01:18 +0000 (14:01 -0700)
commitdef98035d00c57bb8723e7859366536504eb56aa
tree2f25c86607372632a845313f4e6ddea782c79440
parent2765233c64c35eb43a8b46c377fb8b464469221f
parent4f8303905eafaa04fd08a20a08a81436aea2d4b9
Merge branch 'maint'

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