From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2019 23:29:32 +0000 (-0800)
Subject: Merge branch 'bw/mailmap'
X-Git-Tag: v2.21.0-rc0~108
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d076ad1330ea79fb1364d2078446f8936627f96c?hp=94022736ea21c8e20b287badbedc4eecf3406110

Merge branch 'bw/mailmap'

* bw/mailmap:
mailmap: update brandon williams's email address
---

diff --git a/.mailmap b/.mailmap
index eb7b5fc7b9..247a3deb7e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,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>
+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>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>