diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-17 13:09:55 -0700 |
| commit | 60858f343aa909305c28790c7684bf88905695a2 (patch) | |
| tree | a49486fea05a68d019262140c24e63483a1affcc /builtin/get-tar-commit-id.c | |
| parent | 28bdd99065afa449b59d864be776ecf587c5bc18 (diff) | |
| parent | 2ec4150713eabc725ba1c43fbe032adb43d5d4cf (diff) | |
| download | git-60858f343aa909305c28790c7684bf88905695a2.tar.gz | |
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 'builtin/get-tar-commit-id.c')
0 files changed, 0 insertions, 0 deletions