Code

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)
* 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

1  2 
.gitignore
Makefile
builtin/commit.c
merge-recursive.c

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge