An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
individual persons", 2013-08-12), noted that there were two name
spellings and two email addresses and mapped the crustytoothpaste.net
address to the crustytoothpaste.ath.cx address. The latter is an older,
obsolete address, while the former is current, so switch the order of
the addresses so that git log displays the correct address.
Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net>
---
I intentionally avoided the use of the first person here, because I
wasn't sure what the preference of the list was on that. Hopefully it
reads naturally and isn't awkward.
If not, I can send a v3.
.mailmap | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 7c71e88ea5..df7cf6313c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,8 +25,8 @@ Ben Walton <bdwal...@gmail.com> <bwal...@artsci.utoronto.ca>
Benoit Sigoure <tsuna...@gmail.com> <ts...@lrde.epita.fr>
Bernt Hansen <be...@norang.ca> <be...@alumni.uwaterloo.ca>
Brandon Casey <draf...@gmail.com> <ca...@nrlssc.navy.mil>
-brian m. carlson <sand...@crustytoothpaste.ath.cx> Brian M. Carlson
<sand...@crustytoothpaste.ath.cx>
-brian m. carlson <sand...@crustytoothpaste.ath.cx>
<sand...@crustytoothpaste.net>
+brian m. carlson <sand...@crustytoothpaste.net> Brian M. Carlson
<sand...@crustytoothpaste.ath.cx>
+brian m. carlson <sand...@crustytoothpaste.net>
<sand...@crustytoothpaste.ath.cx>
Bryan Larsen <br...@larsen.st> <bryan.lar...@gmail.com>
Bryan Larsen <br...@larsen.st> <bryanlar...@yahoo.com>
Cheng Renquan <crq...@gmail.com>
