diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-12 14:09:57 -0700 |
| commit | 9ad8474b986b0295df6ba1455daa611a7a49a49e (patch) | |
| tree | 54725ffc3ffc4e213e7e3b34a9bd44bc0c044731 /git-gui/macosx/AppMain.tcl | |
| parent | Merge branch 'dt/reflog-tests' (diff) | |
| parent | unpack-trees: populate cache-tree on successful merge (diff) | |
| download | tgif-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 'git-gui/macosx/AppMain.tcl')
0 files changed, 0 insertions, 0 deletions