projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66afe50 53474eb)
Merge branch 'jk/mailmap-cleanup' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2012 04:36:42 +0000 (20:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Dec 2012 04:36:42 +0000 (20:36 -0800)
* jk/mailmap-cleanup:
  contrib: update stats/mailmap script
  .mailmap: normalize emails for Linus Torvalds
  .mailmap: normalize emails for Jeff King
  .mailmap: fix broken entry for Martin Langhoff
  .mailmap: match up some obvious names/emails


Trivial merge
Git—the stupid content tracker