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 <p...@peff.net>
---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 69301bd..e370e86 100644
--- a/.mailmap
+++ b/.mailmap
@@ -54,7 +54,7 @@ Mark Rada <mar...@uwaterloo.ca>
 Lukas Sandström <luk...@etek.chalmers.se>
 Marc-André Lureau <marcandre.lur...@gmail.com>
 Mark Rada <mar...@uwaterloo.ca>
-Martin Langhoff <mar...@laptop.org>
+Martin Langhoff <mar...@laptop.org> <mar...@catalyst.net.nz>
 Martin von Zweigbergk <martinv...@gmail.com> <martin.von.zweigbe...@gmail.com>
 Michael Coleman <tutu...@gmail.com>
 Michael J Gruber <g...@drmicha.warpmail.net> <michaeljgruber+gm...@fastmail.fm>
-- 
1.8.0.2.4.g59402aa

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to