summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-17 12:34:44 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2019-01-17 12:34:44 +0000
commitd4cbe9ef3d6deb4d443067d6aeab35d3c4f6787b (patch)
treea7ea767d20c115e58b69776b4ebd36b796d8986d /.mailmap
parent045cc32128ee59bf0fe5a8a7acffa55e79e73ae8 (diff)
downloadlibgit2-d4cbe9ef3d6deb4d443067d6aeab35d3c4f6787b.tar.gz
mailmap: prefer ethomson@edwardthomson.comethomson/mailmap
My @github.com address is no more.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8479cf6c4..0b16a7e1f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,7 +16,7 @@ Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.tk>
Sascha Cunz <sascha@babbelbox.org> <Sascha@BabbelBox.org>
Authmillenon <authmillenon@googlemail.com> <martin@ucsmail.de>
Authmillenon <authmillenon@googlemail.com> <authmillenon@googlemail.com>
-Edward Thomson <ethomson@github.com> <ethomson@microsoft.com>
-Edward Thomson <ethomson@github.com> <ethomson@edwardthomson.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@microsoft.com>
+Edward Thomson <ethomson@edwardthomson.com> <ethomson@github.com>
J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
Russell Belfer <rb@github.com> <arrbee@arrbee.com>