| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2009 02:36:19 +0000 (19:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 23 Apr 2009 02:36:19 +0000 (19:36 -0700) | ||
| commit | ea0b767c1ea66f687e58a9fcff45a5a518e699c3 | |
| tree | 9f9c5fa3aef71f723d8cabf4b0374eb6cd27f935 | tree | snapshot |
| parent | 7613ea3595f3a56f0f9d827944775940f1e72ef6 | commit | diff |
| parent | 83ae209bf9708bf1b67dbac4a3629a0003af5dbb | commit | diff |
Merge branch 'jc/maint-read-tree-multi'
* 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
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| builtin-read-tree.c | diff1 | | diff2 | | blob | history |