MNT: Update mailmap

effigies · effigies · commit f81584afe4cf · 2019-11-15T12:20:38.000-05:00
diff --git a/.mailmap b/.mailmap
@@ -14,6 +14,7 @@ Basile Pinsard <basile.pinsard@gmail.com> bpinsard <basile.pinsard@gmail.com>
 Basile Pinsard <basile.pinsard@gmail.com> bpinsard <bpinsard@imed.jussieu.fr>
 Ben Cipollini <ben.cipollini@gmail.com> Ben Cipollini <bcipolli@ucsd.edu>
 Bertrand Thirion <bertrand.thirion@inria.fr> bthirion <bertrand.thirion@inria.fr>
+Cameron Riddell <cameronriddell1@gmail.com> <31414128+CRiddler@users.noreply.github.com>
 Christian Haselgrove <christian.haselgrove@umassmed.edu> Christian Haselgrove <Christian.Haselgrove@umassmed.edu>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Johnson <effigies@bu.edu>
 Christopher J. Markiewicz <markiewicz@stanford.edu> Chris Markiewicz <effigies@gmail.com>
@@ -40,6 +41,8 @@ Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
 Kevin S. Hahn <kevinshahn@gmail.com> Kevin S. Hahn <kshahn@stanford.edu>
 Konstantinos Raktivan <constracti@gmail.com> constracti <constracti@gmail.com>
 Krish Subramaniam <krish.subramaniam@gmail.com> Krish Subramaniam <krish@monster.nmr.mgh.harvard.edu>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com>
+Krzysztof J. Gorgolewski <krzysztof.gorgolewski@gmail.com> <chrisgo@google.com>
 Marc-Alexandre Côté <marc.cote.19@gmail.com> Marc-Alexandre Cote <marc.cote.19@gmail.com>
 Mathias Goncalves <mathiasg@mit.edu> mathiasg <mathiasg@mit.edu>
 Matthew Cieslak <mattcieslak@gmail.com> Matt Cieslak <mattcieslak@gmail.com>
@@ -48,6 +51,7 @@ 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>
+Oscar Esteban <code@oscaresteban.es>
 Paul McCarthy <pauldmccarthy@gmail.com> Paul McCarthy <pauld.mccarthy@gmail.com>
 Satrajit Ghosh <satra@mit.edu> Satrajit Ghosh <satrajit.ghosh@gmail.com>
 Serge Koudoro <skab12@gmail.com> skoudoro <skab12@gmail.com>

-Original file line number
+Diff line change
 Basile Pinsard <[email protected]> bpinsard <[email protected]>
 Ben Cipollini <[email protected]> Ben Cipollini <[email protected]>
 Bertrand Thirion <[email protected]> bthirion <[email protected]>
 +Cameron Riddell <[email protected]> <[email protected]>
 Christian Haselgrove <[email protected]> Christian Haselgrove <[email protected]>
 Christopher J. Markiewicz <[email protected]> Chris Johnson <[email protected]>
 Christopher J. Markiewicz <[email protected]> Chris Markiewicz <[email protected]>
 Kevin S. Hahn <[email protected]> Kevin S. Hahn <[email protected]>
 Konstantinos Raktivan <[email protected]> constracti <[email protected]>
 Krish Subramaniam <[email protected]> Krish Subramaniam <[email protected]>
 +Krzysztof J. Gorgolewski <[email protected]>
 +Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
 Marc-Alexandre Côté <[email protected]> Marc-Alexandre Cote <[email protected]>
 Mathias Goncalves <[email protected]> mathiasg <[email protected]>
 Matthew Cieslak <[email protected]> Matt Cieslak <[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]>
 +Oscar Esteban <[email protected]>
 Paul McCarthy <[email protected]> Paul McCarthy <[email protected]>
 Satrajit Ghosh <[email protected]> Satrajit Ghosh <[email protected]>
 Serge Koudoro <[email protected]> skoudoro <[email protected]>