.mailmap: normalize emails for Jeff King

peff · gitster · commit c4878fd924c9 · 2012-12-12T11:09:11.000-08:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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>

-Original file line number
+Diff line change
 İsmail Dönmez <[email protected]>
 Jakub Narębski <[email protected]>
 Jay Soffian <[email protected]>
 +Jeff King <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>