aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-08-05 10:11:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-08-05 10:11:14 -0700
commit4fcd30df85a50ad244424e220a0e032cdd544266 (patch)
tree4e738ea2a1d1e7ee09fcecba7721c23da80dd9f5 /.mailmap
parentd6f3ab573ee48927c7ef272e56b043758feb0a81 (diff)
parent487e5707852cca03f924ea4dcfbcad1030db58d8 (diff)
downloadgit-4fcd30df85a50ad244424e220a0e032cdd544266.tar.gz
git-4fcd30df85a50ad244424e220a0e032cdd544266.tar.xz
Merge branch 'sb/mailmap-updates'
* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 57551b05d..dfa2e6534 100644
--- a/.mailmap
+++ b/.mailmap
@@ -130,6 +130,9 @@ 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 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>
Michael W. Olson <mwolson@gnu.org>
Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>