projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5a333ad d866924)
Merge branch 'jc/merge-bases-paint-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Oct 2012 18:42:15 +0000 (11:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Oct 2012 18:42:15 +0000 (11:42 -0700)
commit683a820d511b3a05ea997fb4a83e78d65b623293
treec2a65f1f0e8ddb72578cd3d05220a4c4999bfde7tree | snapshot
parent5a333adeb57e5fdf66d144911d8930e702210706commit | diff
parentd866924a080215dd276c510abf255a8929b55643commit | 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
commit.c diff1 | diff2 | blob | history
Git—the stupid content tracker