From: Junio C Hamano <junkio@cox.net>
Date: Thu, 27 Apr 2006 08:37:03 +0000 (-0700)
Subject: Merge branch 'jc/cache-tree' into next
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=70b1fb23e29a909883c4a1b452610e5b1aa414a6;p=git.git

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  read-tree: teach 1-way merege and plain read to prime cache-tree.
  read-tree: teach 1 and 2 way merges about cache-tree.
  update-index: when --unresolve, smudge the relevant cache-tree entries.
---

70b1fb23e29a909883c4a1b452610e5b1aa414a6