From cdb6b5ac67a48e6d25eb44dd2d632b60cfc7b743 Mon Sep 17 00:00:00 2001 From: Stefan Beller <stefanbeller@googlemail.com> Date: Mon, 12 Aug 2013 10:12:09 +0200 Subject: .mailmap: Combine more (name, email) to individual persons Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- .mailmap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to '.mailmap') 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> -- cgit v1.2.1