From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Martin Langhoff <martin@laptop.org>
Subject: [PATCH 2/5] .mailmap: fix broken entry for Martin Langhoff
Date: Wed, 12 Dec 2012 06:38:06 -0500 [thread overview]
Message-ID: <20121212113806.GB18803@sigill.intra.peff.net> (raw)
In-Reply-To: <20121212113036.GB19625@sigill.intra.peff.net>
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>
---
.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 <marada@uwaterloo.ca>
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>
--
1.8.0.2.4.g59402aa
next prev parent reply other threads:[~2012-12-12 11:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-12 11:30 [PATCH 0/5] git.git .mailmap cleanups Jeff King
2012-12-12 11:36 ` [PATCH 1/5] .mailmap: match up some obvious names/emails Jeff King
2012-12-12 11:38 ` Jeff King [this message]
2012-12-12 11:38 ` [PATCH 3/5] .mailmap: normalize emails for Jeff King Jeff King
2012-12-12 11:41 ` [PATCH 4/5] .mailmap: normalize emails for Linus Torvalds Jeff King
2012-12-12 11:41 ` [PATCH 5/5] contrib: update stats/mailmap script Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121212113806.GB18803@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=martin@laptop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).