diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:31:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 13:31:01 -0700 |
| commit | 034667a458057ef1e571973a38ebbdf0045a63e9 (patch) | |
| tree | db6473879e0ee571eda48e64ba378cf0a63bb793 /.mailmap | |
| parent | ea5b2dd28f7dc6e0f331af2aad13e281e7a9a408 (diff) | |
| parent | 8f9aeb0d36c6cbfb849946bb272fa0d3c4611547 (diff) | |
| download | git-034667a458057ef1e571973a38ebbdf0045a63e9.tar.gz | |
Sync with 2.12.2
Diffstat (limited to '.mailmap')
| -rw-r--r-- | .mailmap | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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> |