Merge branch 'jc/maint-read-tree-multi' into maint
commitd265ddce1fe3860f67bfe5491dd75b0e657d9062
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:02:59 +0000 (3 15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 22:02:59 +0000 (3 15:02 -0700)
tree34c12dfaee279dcbebd5f46fc32dd4c2936a7ad1
parentc2eae0a5f604738b9ecce3d540ea48ceb0f2a869
parent83ae209bf9708bf1b67dbac4a3629a0003af5dbb
Merge branch 'jc/maint-read-tree-multi' into maint

* jc/maint-read-tree-multi:
  checkout branch: prime cache-tree fully
  read-tree -m A B: prime cache-tree from the switched-to tree
  Move prime_cache_tree() to cache-tree.c
  read-tree A B: do not corrupt cache-tree