summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-27 01:33:07 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-27 01:33:07 -0700
commit7927a55d5bde25702dca4fb1a7d6eb7ef61110ba (patch)
treeed3c465e99f20045c9e5e85d4123e2820a097066 /merge-index.c
parentread-tree: teach 1 and 2 way merges about cache-tree. (diff)
downloadtgif-7927a55d5bde25702dca4fb1a7d6eb7ef61110ba.tar.xz
read-tree: teach 1-way merege and plain read to prime cache-tree.
This teaches read-tree to fully populate valid cache-tree when reading a tree from scratch, or reading a single tree into an existing index, reusing only the cached stat information (i.e. one-way merge). We have already taught update-index about cache-tree, so "git checkout" followed by updates to a few path followed by a "git commit" would become very efficient. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions