diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:10 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:10 +0900 |
commit | e1dd23a8c9567daf98a726fc7a5d7578a7681bb4 (patch) | |
tree | 41813ad7f66750a8ea8f865c45b4c063e84dee7f | |
parent | Merge branch 'sb/object-store-replace' (diff) | |
parent | mailmap: update brian m. carlson's email address (diff) | |
download | tgif-e1dd23a8c9567daf98a726fc7a5d7578a7681bb4.tar.xz |
Merge branch 'bc/mailmap-self'
* bc/mailmap-self:
mailmap: update brian m. carlson's email address
-rw-r--r-- | .mailmap | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -25,8 +25,8 @@ 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> <sandals@crustytoothpaste.net> +brian m. carlson <sandals@crustytoothpaste.net> Brian M. Carlson <sandals@crustytoothpaste.ath.cx> +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> Cheng Renquan <crquan@gmail.com> |