From: brian m. carlson <bk2204@github.com>
Date: Thu, 20 Feb 2020 02:24:09 +0000 (+0000)
Subject: mailmap: add an additional email address for brian m. carlson
X-Git-Tag: v2.26.0-rc0~12^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fa0e046679b69ee7039a60674e9b16f83780e85;p=thirdparty%2Fgit.git

mailmap: add an additional email address for brian m. carlson

To more accurately track the provenance of contributions, brian uses a
work email address for commits created at work. Add this email address
to .mailmap so that contributions are properly attributed to the same
person.

Signed-off-by: brian m. carlson <bk2204@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/.mailmap b/.mailmap
index 7c9441837a..9f1b794729 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,7 @@ Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
 Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>