projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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.


Trivial merge
The core git plumbing