author | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 May 2009 22:02:59 +0000 (15:02 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 3 May 2009 22:02:59 +0000 (15:02 -0700) | ||
commit | d265ddce1fe3860f67bfe5491dd75b0e657d9062 | |
tree | 34c12dfaee279dcbebd5f46fc32dd4c2936a7ad1 | tree | snapshot |
parent | c2eae0a5f604738b9ecce3d540ea48ceb0f2a869 | commit | diff |
parent | 83ae209bf9708bf1b67dbac4a3629a0003af5dbb | commit | diff |
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
* 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