mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-21 10:59:17 +02:00
Code

Merge branch 'sb/mailmap-updates' 

* sb/mailmap-updates:
  .mailmap: Multiple addresses of Michael S. Tsirkin
This commit is contained in:
Junio C Hamano 2013-08-05 10:11:14 -07:00
parent d6f3ab573e 487e570785
commit 4fcd30df85
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.mailmap
View File

@ -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>