From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2015 21:09:57 +0000 (-0700)
Subject: Merge branch 'dt/unpack-trees-cache-tree-revalidate'
X-Git-Tag: v2.6.0-rc0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ad8474b986b0295df6ba1455daa611a7a49a49e;p=thirdparty%2Fgit.git

Merge branch 'dt/unpack-trees-cache-tree-revalidate'

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

9ad8474b986b0295df6ba1455daa611a7a49a49e