diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-24 07:07:48 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 07:07:48 +0200 |
| commit | 8868ba19626a72d5883241c36fd5477897ef8dd1 (patch) | |
| tree | 89157def2f48bd982313403bd658420be10624a6 /ll-merge.h | |
| parent | Merge branch 'jh/string-list-micro-optim' (diff) | |
| parent | unpack-trees: avoid duplicate ODB lookups during checkout (diff) | |
| download | git-8868ba19626a72d5883241c36fd5477897ef8dd1.tar.xz git-8868ba19626a72d5883241c36fd5477897ef8dd1.zip | |
Merge branch 'jh/unpack-trees-micro-optim'
In a 2- and 3-way merge of trees, more than one source trees often
end up sharing an identical subtree; optimize by not reading the
same tree multiple times in such a case.
* jh/unpack-trees-micro-optim:
unpack-trees: avoid duplicate ODB lookups during checkout
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions