Merge branch 'ew/normal-to-e'

* ew/normal-to-e: .mailmap: update to my shorter email address

Merge branch 'ew/normal-to-e'
* ew/normal-to-e: .mailmap: update to my shorter email address
231cc948 · Junio C Hamano · 7a959426 · fa722458 · 231cc948
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

.mailmap .mailmap +1 -0

未找到文件。
--- 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>