summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-12-12 11:38:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-12 19:09:11 (GMT)
commitc4878fd924c922d12fdfe4e97e4559679342c583 (patch)
tree44281af01ea5a25696c7c29cd54a817459587dae /.mailmap
parent32d979eaf5a9bbe770aa27e1a8cfed1eeb0969e1 (diff)
downloadgit-c4878fd924c922d12fdfe4e97e4559679342c583.zip
git-c4878fd924c922d12fdfe4e97e4559679342c583.tar.gz
git-c4878fd924c922d12fdfe4e97e4559679342c583.tar.bz2
.mailmap: normalize emails for Jeff King
I never meant anything special by using my @github.com address; it is merely a mistake that it has sometimes bled through to patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index e370e86..4a27b7f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,7 @@ Horst H. von Brand <vonbrand@inf.utfsm.cl>
İsmail Dönmez <ismail@pardus.org.tr>
Jakub Narębski <jnareb@gmail.com>
Jay Soffian <jaysoffian+git@gmail.com>
+Jeff King <peff@peff.net> <peff@github.com>
Joachim Berdal Haga <cjhaga@fys.uio.no>
Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>