summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2013-04-21 08:59:04 +0200
committernulltoken <emeric.fermas@gmail.com>2013-04-21 09:04:01 +0200
commit6b24688758b721afece65702475f76d225d096be (patch)
tree1a0768f254e8f59052e745f482041d75895ea3e4
parent8f24e65ff6f7573bc6778f5bbea7119fc9b7b626 (diff)
downloadlibgit2-6b24688758b721afece65702475f76d225d096be.tar.gz
mailmap: Coalesce some identities
-rw-r--r--.mailmap11
1 files changed, 11 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index a8b171908..3f5a087ea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,3 +5,14 @@ Ben Straub <bs@github.com> Ben Straub <ben@straubnet.net>
Ben Straub <bs@github.com> Ben Straub <bstraub@github.com>
Carlos Martín Nieto <cmn@dwim.me> <carlos@cmartin.tk>
Carlos Martín Nieto <cmn@dwim.me> <cmn@elego.de>
+nulltoken <emeric.fermas@gmail.com> <emeric.fermas@gmail.com>
+Scott J. Goldman <scottjg@github.com> <scottjgo@gmail.com>
+Martin Woodward <martin.woodward@microsoft.com> <martinwo@microsoft.com>
+Peter Drahoš <drahosp@gmail.com> <drahosp@gmail.com>
+Adam Roben <adam@github.com> <adam@roben.org>
+Adam Roben <adam@github.com> <adam@github.com>
+Xavier L. <xavier.l@afrosoft.tk> <xavier.l@afrosoft.ca>
+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>