Merge pull request #17782 from tacaswell/mnt_mailmap

dstansby · web-flow · commit f1ec223baa64 · 2020-06-28T11:05:17.000+01:00
MNT: update mailmap
diff --git a/.mailmap b/.mailmap
@@ -161,6 +161,7 @@ Matthew Emmett <memmett@gmail.com>
 Matthew Emmett <memmett@gmail.com> <memmett@unc.edu>
 
 Matthias Bussonnier <bussonniermatthias@gmail.com>
+Matthias Bussonnier <bussonniermatthias@gmail.com> <mbussonnier@ucmerced.edu>
 
 Matthias Lüthi <maluethi@protonmail.ch>
 Matthias Lüthi <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>
@@ -200,7 +201,9 @@ Paul Ganssle <pg@example.com>
 Paul Hobson <pmhobson@gmail.com>
 Paul Hobson <pmhobson@gmail.com> vagrant <vagrant@precise32.(none)>
 
+Paul Ivanov <pivanov314@gmail.com>
 Paul Ivanov <pivanov314@gmail.com> <pi@berkeley.edu>
+Paul Ivanov <pivanov314@gmail.com> <pivanov5@bloomberg.net>
 
 Per Parker <wisalam@live.com>
 
@@ -218,13 +221,15 @@ Rishikesh <rishikksh20@gmail.com>
 RyanPan <ryanbelt1993129@hotmail.com>
 
 Samesh Lakhotia <samesh.lakhotia@gmail.com>
+Samesh Lakhotia <43701530+sameshl@users.noreply.github.com> <samesh.lakhotia@gmail.com>'
 
 Scott Lasley <selasley@me.com>
 
 Sebastian Raschka <mail@sebastianraschka.com>
 Sebastian Raschka <mail@sebastianraschka.com> <se.raschka@me.com>
 
 Sidharth Bansal <bansal.sidharth2996@gmail.com>
+Sidharth Bansal <20972099+SidharthBansal@users.noreply.github.com> <bansal.sidharth2996@gmail.com>
 
 Simon Cross <hodgestar+github@gmail.com> <hodgestar@gmail.com>
 

-Original file line number
+Diff line change
 Matthew Emmett <[email protected]> <[email protected]>
 Matthias Bussonnier <[email protected]>
 +Matthias Bussonnier <[email protected]> <[email protected]>
 Matthias Lüthi <[email protected]>
 Matthias Lüthi <[email protected]> <[email protected]>
 Paul Hobson <[email protected]>
 Paul Hobson <[email protected]> vagrant <vagrant@precise32.(none)>
 +Paul Ivanov <[email protected]>
 Paul Ivanov <[email protected]> <[email protected]>
 +Paul Ivanov <[email protected]> <[email protected]>
 Per Parker <[email protected]>
 RyanPan <[email protected]>
 Samesh Lakhotia <[email protected]>
 +Samesh Lakhotia <[email protected]> <[email protected]>'
 Scott Lasley <[email protected]>
 Sebastian Raschka <[email protected]>
 Sebastian Raschka <[email protected]> <[email protected]>
 Sidharth Bansal <[email protected]>
 +Sidharth Bansal <[email protected]> <[email protected]>
 Simon Cross <[email protected]> <[email protected]>