commit | 683a820d511b3a05ea997fb4a83e78d65b623293 | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon Oct 08 11:42:15 2012 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon Oct 08 11:42:15 2012 -0700 |
tree | c2a65f1f0e8ddb72578cd3d05220a4c4999bfde7 | |
parent | 5a333adeb57e5fdf66d144911d8930e702210706 [diff] | |
parent | d866924a080215dd276c510abf255a8929b55643 [diff] |
Merge branch 'jc/merge-bases-paint-fix' "git fmt-merge-msg" (an internal helper reduce_heads() it uses) had a severe performance regression; an empty "git pull" took forever to finish as the result. * jc/merge-bases-paint-fix: paint_down_to_common(): parse commit before relying on its timestamp