Merge branch 'dt/unpack-trees-cache-tree-revalidate'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2015 21:09:57 +0000 (14:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Aug 2015 21:09:57 +0000 (14:09 -0700)
The code to perform multi-tree merges has been taught to repopulate
the cache-tree upon a successful merge into the index, so that
subsequent "diff-index --cached" (hence "status") and "write-tree"
(hence "commit") will go faster.

The same logic in "git checkout" may now be removed, but that is a
separate issue.

* dt/unpack-trees-cache-tree-revalidate:
unpack-trees: populate cache-tree on successful merge

1  2 
unpack-trees.c
diff --cc unpack-trees.c
Simple merge