Merge branch 'maint'
commitfab45027e0cdf3ebdade137cb3740604da7bb4bc
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 04:31:20 +0000 (18 21:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Apr 2010 04:31:20 +0000 (18 21:31 -0700)
tree32a7b9192c508b3a6e527246f1f842de6df889de
parente8a12280530f16bf2089999ceefe35794d115d07
parent03aa87ed9912a6beac1a23e69ef0b70e1589d3d0
Merge branch 'maint'

* maint:
  Documentation: Describe other situations where -z affects git diff
Documentation/diff-options.txt