summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-12-12 06:38:06 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-12 11:09:11 -0800
commit32d979eaf5a9bbe770aa27e1a8cfed1eeb0969e1 (patch)
tree0639f5cc57b8317176317085c081a0f3c1eb7661 /.mailmap
parent.mailmap: match up some obvious names/emails (diff)
downloadtgif-32d979eaf5a9bbe770aa27e1a8cfed1eeb0969e1.tar.xz
.mailmap: fix broken entry for Martin Langhoff
Commit adc3192 (Martin Langhoff has a new e-mail address, 2010-10-05) added a mailmap entry, but forgot that both the old and new email addresses need to appear for one to be mapped to the other (i.e., we do not key mailmap emails by name). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 69301bd6e6..e370e867ad 100644
--- a/.mailmap
+++ b/.mailmap
@@ -54,7 +54,7 @@ Li Hong <leehong@pku.edu.cn>
Lukas Sandström <lukass@etek.chalmers.se>
Marc-André Lureau <marcandre.lureau@gmail.com>
Mark Rada <marada@uwaterloo.ca>
-Martin Langhoff <martin@laptop.org>
+Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
Michael Coleman <tutufan@gmail.com>
Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>