summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMichael J Gruber <git@grubix.eu>2017-03-24 14:01:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-24 19:30:27 (GMT)
commit296ab786eed237b59f76f6411e895cc1e3ce14ab (patch)
treefcfe68ea04755be405f03d96550d8f9acb96b0eb /.mailmap
parent8624735d9aca62ffaef84de3b2b8345b1771086a (diff)
downloadgit-296ab786eed237b59f76f6411e895cc1e3ce14ab.zip
git-296ab786eed237b59f76f6411e895cc1e3ce14ab.tar.gz
git-296ab786eed237b59f76f6411e895cc1e3ce14ab.tar.bz2
mailmap: use Michael J Gruber's new address
Map both old addresses to the new, hopefully more permanent one. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index ab59b2f..c44cf67 100644
--- a/.mailmap
+++ b/.mailmap
@@ -151,7 +151,8 @@ Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
Michael Coleman <tutufan@gmail.com>
-Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
+Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>