projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9ed2574 7927a55)
Merge branch 'jc/cache-tree' into next
authorJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 27 Apr 2006 08:37:03 +0000 (01:37 -0700)
commit70b1fb23e29a909883c4a1b452610e5b1aa414a6
treefd1574ac77578e05b9e2c52036f10559e5602052tree | snapshot
parent9ed2574798a216becf7ae9c94baa237d27edffc0commit | diff
parent7927a55d5bde25702dca4fb1a7d6eb7ef61110bacommit | 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.
The core git plumbing