Merge branch 'maint'

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

diff --cc Documentation/diff-options.txt
Simple merge