summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-24 20:31:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-24 20:31:01 (GMT)
commit034667a458057ef1e571973a38ebbdf0045a63e9 (patch)
treedb6473879e0ee571eda48e64ba378cf0a63bb793 /.mailmap
parentea5b2dd28f7dc6e0f331af2aad13e281e7a9a408 (diff)
parent8f9aeb0d36c6cbfb849946bb272fa0d3c4611547 (diff)
downloadgit-034667a458057ef1e571973a38ebbdf0045a63e9.zip
git-034667a458057ef1e571973a38ebbdf0045a63e9.tar.gz
git-034667a458057ef1e571973a38ebbdf0045a63e9.tar.bz2
Sync with 2.12.2
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e06526a..ab85e0d 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>