Merge branch 'tr/cache-tree'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:20 +0000 (16:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Dec 2011 00:05:20 +0000 (16:05 -0800)
commit33e7fefef6b68b300870e04904ad1db48be9b580
tree2ec6cf691b2f86aa0830c6f2927ac661bf3db87e
parent367d20ec6b9e8e297537f665fb528346bd0aff27
parent6c52ec8a9ab48b50fc8bf9559467d5a4cf7eee3b
Merge branch 'tr/cache-tree'

* tr/cache-tree:
  reset: update cache-tree data when appropriate
  commit: write cache-tree data when writing index anyway
  Refactor cache_tree_update idiom from commit
  Test the current state of the cache-tree optimization
  Add test-scrap-cache-tree
.gitignore
Makefile
builtin/commit.c
merge-recursive.c