summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-17 13:14:25 +0000
committerGitHub <noreply@github.com>2019-01-17 13:14:25 +0000
commitcecbe7462de4eb5b99742b37622d875c8113c23e (patch)
tree1e159874791d76819c75de020c81e2fb04820132
parent628ebc5168ca83d87b1d2fd2a0ad4095e47b0af2 (diff)
parentd4cbe9ef3d6deb4d443067d6aeab35d3c4f6787b (diff)
downloadlibgit2-cecbe7462de4eb5b99742b37622d875c8113c23e.tar.gz
Merge pull request #4941 from libgit2/ethomson/mailmap
mailmap: prefer ethomson@edwardthomson.com
-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>