]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28bdd99 2ec4150)
Merge branch 'jk/merge-subtree-heuristics'
authorJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (13:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Aug 2018 20:09:55 +0000 (13:09 -0700)
commit60858f343aa909305c28790c7684bf88905695a2
treea49486fea05a68d019262140c24e63483a1affcctree | snapshot
parent28bdd99065afa449b59d864be776ecf587c5bc18commit | diff
parent2ec4150713eabc725ba1c43fbe032adb43d5d4cfcommit | diff
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
match-trees.c diff1 | diff2 | blob | history
t/t6029-merge-subtree.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.