From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Oct 2012 18:42:15 +0000 (-0700)
Subject: Merge branch 'jc/merge-bases-paint-fix'
X-Git-Tag: v1.8.0-rc1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=683a820d511b3a05ea997fb4a83e78d65b623293;p=git.git

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
---

683a820d511b3a05ea997fb4a83e78d65b623293