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>
Michael J Gruber committed
Mar 24, 2017 at 15:01 UTC
296ab786eed237b59f76f6411e895cc1e3ce14ab
1 file changed
+2
-1
.mailmap
+2
-1
@@ -151,7 +151,8 @@ Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
151
Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
152
Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
153
Michael Coleman <tutufan@gmail.com>
154
-Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
154
+Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
155
+Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
156
Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
157
Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
158
Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>