Merge branch 'sb/mailmap-updates'

gitster · gitster · commit 2809258c28b9 · 2013-08-13T10:49:33.000-07:00
* sb/mailmap-updates:
  .mailmap: Combine more (name, email) to individual persons
  .mailmap: update long-lost friends with multiple defunct addresses
diff --git a/.mailmap b/.mailmap
@@ -18,10 +18,14 @@ Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
+Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
+Amos Waterland <apw@debian.org> <apw@us.ibm.com>
 Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
+Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
 Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
 Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
-Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.ath.cx> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
 Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>
@@ -34,6 +38,8 @@ Dan Johnson <computerdruid@gmail.com>
 Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
 Dana L. How <danahow@gmail.com> Dana How
 Daniel Barkalow <barkalow@iabervon.org>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
+Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
 David Brown <git@davidb.org> <davidb@quicinc.com>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
@@ -68,11 +74,17 @@ J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
 J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
 Jakub Narębski <jnareb@gmail.com>
 James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
+# The 2 following authors are probably the same person,
+# but both emails bounce.
+Jason McMullan <jason.mcmullan@timesys.com>
+Jason McMullan <mcmullan@netapp.com>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
 Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
 Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
 Jeff King <peff@peff.net> <peff@github.com>
 Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
+Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
+Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
 Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
@@ -144,7 +156,7 @@ Michele Ballabio <barra_cuda@katamail.com>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
 Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
 Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
-Nanako Shiraishi <nanako3@bluebottle.com>
+Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
 Nanako Shiraishi <nanako3@lavabit.com>
 Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
 Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
@@ -177,6 +189,8 @@ Robert Fitzsimons <robfitz@273k.net>
 Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
 Robert Zeh <robert.a.zeh@gmail.com>
 Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
+Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
 Ryan Anderson <ryan@michonline.com> <rda@google.com>
 Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
 Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>

-Original file line number
+Diff line change
 Anders Kaseorg <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Aneesh Kumar K.V <[email protected]>
 +Amos Waterland <[email protected]> <[email protected]>
 +Amos Waterland <[email protected]> <[email protected]>
 Ben Walton <[email protected]> <[email protected]>
 +Benoit Sigoure <[email protected]> <[email protected]>
 Bernt Hansen <[email protected]> <[email protected]>
 Brandon Casey <[email protected]> <[email protected]>
 -Brian M. Carlson <[email protected]>
 +brian m. carlson <[email protected]> Brian M. Carlson <[email protected]>
 +brian m. carlson <[email protected]> <[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
 Bryan Larsen <[email protected]> <[email protected]>
 Cheng Renquan <[email protected]>
 Dana L. How <[email protected]> <[email protected]>
 Dana L. How <[email protected]> Dana How
 Daniel Barkalow <[email protected]>
 +Daniel Trstenjak <[email protected]> <[email protected]>
 +Daniel Trstenjak <[email protected]> <[email protected]>
 David Brown <[email protected]> <[email protected]>
 David D. Kilzer <[email protected]>
 David Kågedal <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 Jakub Narębski <[email protected]>
 James Y Knight <[email protected]> <[email protected]>
 +# The 2 following authors are probably the same person,
 +# but both emails bounce.
 +Jason McMullan <[email protected]>
 +Jason McMullan <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jason Riedy <[email protected]> <[email protected]>
 Jay Soffian <[email protected]> <[email protected]>
 Jeff King <[email protected]> <[email protected]>
 Jeff Muizelaar <[email protected]> <[email protected]>
 +Jens Axboe <[email protected]> <[email protected]>
 +Jens Axboe <[email protected]> <[email protected]>
 Jim Meyering <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
 Johannes Schindelin <[email protected]> <[email protected]>
 Miklos Vajna <[email protected]> <[email protected]>
 Namhyung Kim <[email protected]> <[email protected]>
 Namhyung Kim <[email protected]> <[email protected]>
 -Nanako Shiraishi <[email protected]>
 +Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
 Nanako Shiraishi <[email protected]>
 Nelson Elhage <[email protected]> <[email protected]>
 Nelson Elhage <[email protected]> <[email protected]>
 Robert Shearman <[email protected]> <[email protected]>
 Robert Zeh <[email protected]>
 Robin Rosenberg <[email protected]> <[email protected]>
 +Rutger Nijlunsing <[email protected]> <[email protected]>
 +Rutger Nijlunsing <[email protected]> <[email protected]>
 Ryan Anderson <[email protected]> <[email protected]>
 Salikh Zakirov <[email protected]> <[email protected]>
 Sam Vilain <[email protected]> <[email protected]>