Merge branch 'an/diff-index-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:35:55 +0000 (3 15:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:35:55 +0000 (3 15:35 -0700)
* an/diff-index-doc:
  Documentation/diff-index: mention two modes of operation


Trivial merge