Merge branch 'an/diff-index-doc' into maint

* an/diff-index-doc: Documentation/diff-index: mention two modes of operation

Junio C Hamano committed Jul 3, 2013 at 15:35 UTC c9d9a2d6b60178d604a2b78886b031d250980e9f

No changes.