Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:40:38 +0000 (3 15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:40:38 +0000 (3 15:40 -0700)
* fc/do-not-use-the-index-in-add-to-index:
  read-cache: trivial style cleanups
  read-cache: fix wrong 'the_index' usage

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge