summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2013-08-12 10:12:09 +0200
committerJunio C Hamano <gitster@pobox.com>2013-08-13 10:49:06 -0700
commitcdb6b5ac67a48e6d25eb44dd2d632b60cfc7b743 (patch)
treedcb8a920ee059e97d7aa738deb34c8e9b6669a23 /.mailmap
parent10813e0d3c72671e24407ef4bd43b74f60445089 (diff)
downloadgit-cdb6b5ac67a48e6d25eb44dd2d632b60cfc7b743.tar.gz
.mailmap: Combine more (name, email) to individual personssb/mailmap-updates
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 7a5d0a606b..0d062d7de6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,9 +21,11 @@ Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
Amos Waterland <apw@debian.org> <apw@us.ibm.com>
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>
+brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>
Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
Cheng Renquan <crquan@gmail.com>