summaryrefslogtreecommitdiff
path: root/t/t4013/diff.show_side
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-08-12 14:09:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-12 14:09:57 -0700
commit9ad8474b986b0295df6ba1455daa611a7a49a49e (patch)
tree54725ffc3ffc4e213e7e3b34a9bd44bc0c044731 /t/t4013/diff.show_side
parentMerge branch 'dt/reflog-tests' (diff)
parentunpack-trees: populate cache-tree on successful merge (diff)
downloadtgif-9ad8474b986b0295df6ba1455daa611a7a49a49e.tar.xz
Merge branch 'dt/unpack-trees-cache-tree-revalidate'
The code to perform multi-tree merges has been taught to repopulate the cache-tree upon a successful merge into the index, so that subsequent "diff-index --cached" (hence "status") and "write-tree" (hence "commit") will go faster. The same logic in "git checkout" may now be removed, but that is a separate issue. * dt/unpack-trees-cache-tree-revalidate: unpack-trees: populate cache-tree on successful merge
Diffstat (limited to 't/t4013/diff.show_side')
0 files changed, 0 insertions, 0 deletions