Merge branch 'an/diff-index-doc'
commit7abc6b715148118518a6fbdcef82b3e0dabbaa17
authorJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:48:17 +0000 (2 15:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 2 Jun 2013 22:48:17 +0000 (2 15:48 -0700)
tree3fd64d8bc843b718be6e4ee57dbb5473e2a60705
parentf241c08d40ad9d479fb88e99ff0bb90d6dd73eda
parentb3d6e6e7075967659dc2f5064b4829902cca67da
Merge branch 'an/diff-index-doc'

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