![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700) | ||
| commit | 70b1fb23e29a909883c4a1b452610e5b1aa414a6 | |
| tree | fd1574ac77578e05b9e2c52036f10559e5602052 | tree | snapshot |
| parent | 9ed2574798a216becf7ae9c94baa237d27edffc0 | commit | diff |
| parent | 7927a55d5bde25702dca4fb1a7d6eb7ef61110ba | commit | diff |
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.
* 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.