From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Sun, 21 Mar 2010 13:43:47 +0000 (+0100)
Subject: .mailmap: Map the the first submissions of MJG by e-mail
X-Git-Tag: v1.7.0.3~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=11f54989da573df35999222b9e504c12697b9392;p=git.git

.mailmap: Map the the first submissions of MJG by e-mail

so that git shortlog with '-e' coalesces all my commits.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/.mailmap b/.mailmap
index 975e6758e..88bd01e16 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,6 +36,7 @@ Li Hong <leehong@pku.edu.cn>
 Lukas Sandström <lukass@etek.chalmers.se>
 Martin Langhoff <martin@catalyst.net.nz>
 Michael Coleman <tutufan@gmail.com>
+Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
 Michael W. Olson <mwolson@gnu.org>
 Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>