| commit | 60858f343aa909305c28790c7684bf88905695a2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Aug 2018 20:09:55 +0000 (17 13:09 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 17 Aug 2018 20:09:55 +0000 (17 13:09 -0700) | ||
| tree | a49486fea05a68d019262140c24e63483a1affcc | treesnapshot (tar.gz zip) |
| parent | 28bdd99065afa449b59d864be776ecf587c5bc18 | commitdiff |
| parent | 2ec4150713eabc725ba1c43fbe032adb43d5d4cf | commitdiff |
Merge branch 'jk/merge-subtree-heuristics'
The automatic tree-matching in "git merge -s subtree" was broken 5
years ago and nobody has noticed since then, which is now fixed.
* jk/merge-subtree-heuristics:
score_trees(): fix iteration over trees with missing entries
The automatic tree-matching in "git merge -s subtree" was broken 5
years ago and nobody has noticed since then, which is now fixed.
* jk/merge-subtree-heuristics:
score_trees(): fix iteration over trees with missing entries
| match-trees.c | diff1 | diff2 | blobhistory |
| t/t6029-merge-subtree.sh | diff1 | diff2 | blobhistory |