| commit | 9ad8474b986b0295df6ba1455daa611a7a49a49e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Aug 2015 21:09:57 +0000 (12 14:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Aug 2015 21:09:57 +0000 (12 14:09 -0700) | ||
| tree | 54725ffc3ffc4e213e7e3b34a9bd44bc0c044731 | treesnapshot (tar.gz zip) |
| parent | 0188f32304d916ec6a2443937e36421e8da9a8fd | commitdiff |
| parent | 52fca2184df8398f0ba212cd6a0ec1fb123b7473 | commitdiff |
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
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
| unpack-trees.c | diff1 | diff2 | blobhistory |