Code

Merge branch 'jc/index-update-if-able' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:33:05 +0000 (12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 19:33:05 +0000 (12:33 -0700)
* jc/index-update-if-able:
  update $GIT_INDEX_FILE when there are racily clean entries
  diff/status: refactor opportunistic index update

1  2 
builtin/commit.c
builtin/diff.c
cache.h
read-cache.c

Simple merge
diff --cc builtin/diff.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge