summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-18 14:40:12 -0700
commit977cb3e2c5692234159b7f879eaccef946a0f9cb (patch)
tree0ed81535f1d9425f04abcf3bc979d4691eeaad48
parent258b862edbacc28bc0ed7543e60ae327ec08299b (diff)
parentfa7224589fb719503d883c43e87513ab514b4a15 (diff)
downloadgit-977cb3e2c5692234159b7f879eaccef946a0f9cb.tar.gz
Merge branch 'ew/normal-to-e' into HEAD
* ew/normal-to-e: .mailmap: update to my shorter email address
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e5b4126bec..a9162c0095 100644
--- 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>