MNT: Update mailmap

effigies · effigies · commit 203acd0d3017 · 2020-04-08T16:38:07.000-04:00
diff --git a/.mailmap b/.mailmap
@@ -8,6 +8,7 @@
 # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
 # gives no duplicates.
 Alexandre Gramfort <alexandre.gramfort@inria.fr> Alexandre Gramfort <alexandre.gramfort@m4x.org>
+Anibal Sólon <anibalsolon@gmail.com>
 Ariel Rokem <arokem@gmail.com> arokem <arokem@gmail.com>
 B. Nolan Nichols <nolan.nichols@gmail.com> Nolan Nichols <nolan.nichols@gmail.com>
 Basile Pinsard <basile.pinsard@gmail.com> bpinsard <basile.pinsard@gmail.com>
@@ -52,8 +53,11 @@ Michael Hanke <michael.hanke@gmail.com> <michaelhanke@mvpa1.dartmouth.edu>
 Michiel Cottaar <MichielCottaar@protonmail.com> Michiel Cottaar <MichielCottaar@protonmail.ch>
 Ly Nguyen <nguyen60@seattleu.edu> lxn2 <lxn2@uw.edu>
 Oliver P. Hinds <ohinds@gmail.com> ohinds <ohinds@gmail.com>
+Or Duek <orduek@gmail.com>
 Oscar Esteban <code@oscaresteban.es>
 Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
+Roberto Guidotti <robbenson18@gmail.com>
+Roberto Guidotti <robbenson18@gmail.com> <guidotr1@cs-087.org.aalto.fi>
 Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
 Serge Koudoro <skab12@gmail.com> skoudoro <skab12@gmail.com>
 Stephan Gerhard <git@unidesign.ch> Stephan Gerhard <git@github.com>

-Original file line number
+Diff line change
 # This file is up-to-date if the command git log --format="%aN <%aE>" | sort -u
 # gives no duplicates.
 Alexandre Gramfort <[email protected]> Alexandre Gramfort <[email protected]>
 +Anibal Sólon <[email protected]>
 Ariel Rokem <[email protected]> arokem <[email protected]>
 B. Nolan Nichols <[email protected]> Nolan Nichols <[email protected]>
 Basile Pinsard <[email protected]> bpinsard <[email protected]>
 Michiel Cottaar <[email protected]> Michiel Cottaar <[email protected]>
 Ly Nguyen <[email protected]> lxn2 <[email protected]>
 Oliver P. Hinds <[email protected]> ohinds <[email protected]>
 +Or Duek <[email protected]>
 Oscar Esteban <[email protected]>
 Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
 +Roberto Guidotti <[email protected]>
 +Roberto Guidotti <[email protected]> <[email protected]>
 Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 Serge Koudoro <[email protected]> skoudoro <[email protected]>
 Stephan Gerhard <[email protected]> Stephan Gerhard <[email protected]>