Merge branch 'an/diff-index-doc'
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:48:17 +0000 (15:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:48:17 +0000 (15:48 -0700)
* an/diff-index-doc:
Documentation/diff-index: mention two modes of operation

Trivial merge