Merge branch 'ew/normal-to-e' into HEAD

gitster · gitster · commit 977cb3e2c569 · 2016-05-18T14:40:12.000-07:00
* ew/normal-to-e:
  .mailmap: update to my shorter email address
diff --git a/.mailmap b/.mailmap
@@ -51,6 +51,7 @@ Dirk Süsserott <newsletter@dirk.my1.cc>
 Eric Blake <eblake@redhat.com> <ebb9@byu.net>
 Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
 Eric S. Raymond <esr@thyrsus.com>
+Eric Wong <e@80x24.org> <normalperson@yhbt.net>
 Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
 Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
 Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>

-Original file line number
+Diff line change
 Eric Blake <[email protected]> <[email protected]>
 Eric Hanchrow <[email protected]> <[email protected]>
 Eric S. Raymond <[email protected]>
 +Eric Wong <[email protected]> <[email protected]>
 Erik Faye-Lund <[email protected]> <[email protected]>
 Eyvind Bernhardsen <[email protected]> <[email protected]>
 Florian Achleitner <[email protected]> <[email protected]>