mailmap: consistently normalize brian m. carlson's name

jrn · gitster · commit 255eb03edf6e · 2018-09-25T15:10:18.000-07:00
v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,
2018-05-08) changed the mailmap to map

  sandals@crustytoothpaste.ath.cx
   -&gt; brian m. carlson &lt;sandals@crustytoothpaste.net&gt;

instead of

  sandals@crustytoothpaste.net
    -&gt; brian m. carlson &lt;sandals@crustytoothpaste.ath.cx&gt;

That means the mapping

  Brian M. Carlson &lt;sandals@crustytoothpaste.ath.cx&gt;
    -&gt; brian m. carlson &lt;sandals@crustytoothpaste.net&gt;

is redundant, so we can remove it.  More importantly, it means that
the identity "Brian M. Carlson &lt;sandals@crustytoothpaste.net&gt;" used in
some commits is not normalized any more.  Add a mapping for it.

Noticed while updating Debian's Git packaging, which uses "git
shortlog --no-merges" to produce a list of changes in each version,
grouped by author's (normalized) name.

Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
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>
