Merge branch 'jn/mailmap-update'

gitster · gitster · commit 3d560562ab17 · 2018-10-16T16:16:01.000+09:00
The mailmap file update.

* jn/mailmap-update:
  mailmap: consistently normalize brian m. carlson's name
diff --git a/.mailmap b/.mailmap
@@ -25,7 +25,7 @@ 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.net> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.net>
 brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
 Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>

-Original file line number
+Diff line change
 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]>