diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:47 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:47 +0900 |
commit | f1814e02282860a85b0ca85092df08b4788103da (patch) | |
tree | 0ac111abe35f8a7d568d040a6fec87614844ab3d | |
parent | Merge branch 'ds/commit-graph-with-grafts' into maint (diff) | |
parent | mailmap: consistently normalize brian m. carlson's name (diff) | |
download | tgif-f1814e02282860a85b0ca85092df08b4788103da.tar.xz |
Merge branch 'jn/mailmap-update' into maint
The mailmap file update.
* jn/mailmap-update:
mailmap: consistently normalize brian m. carlson's name
-rw-r--r-- | .mailmap | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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> |