From: Jeff King <peff@peff.net>
Date: Wed, 12 Dec 2012 11:38:06 +0000 (-0500)
Subject: .mailmap: fix broken entry for Martin Langhoff
X-Git-Tag: v1.8.1-rc3~11^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32d979eaf5a9bbe770aa27e1a8cfed1eeb0969e1;p=thirdparty%2Fgit.git

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

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>