Merge branch 'an/diff-index-doc' into maint
commitc9d9a2d6b60178d604a2b78886b031d250980e9f
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)
treea2ad98c455cc7f811d521fadebc28197c71ed757
parent897175f1073dac328bc009bbe79bc3c45c9399c3
parentb3d6e6e7075967659dc2f5064b4829902cca67da
Merge branch 'an/diff-index-doc' into maint

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