summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.7.4.4.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:55 -0700
commit60858f343aa909305c28790c7684bf88905695a2 (patch)
treea49486fea05a68d019262140c24e63483a1affcc /Documentation/RelNotes/1.7.4.4.txt
parentMerge branch 'ab/test-must-be-empty' (diff)
parentscore_trees(): fix iteration over trees with missing entries (diff)
downloadtgif-60858f343aa909305c28790c7684bf88905695a2.tar.xz
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
Diffstat (limited to 'Documentation/RelNotes/1.7.4.4.txt')
0 files changed, 0 insertions, 0 deletions