.mailmap: unify various old mail addresses of gitster

gitster · gitster · commit eb2c67ccbd5c · 2012-03-23T14:40:39.000-07:00
"git shortlog -s -e" should show a single current address with this.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/.mailmap b/.mailmap
@@ -29,7 +29,13 @@ Joachim Berdal Haga <cjhaga@fys.uio.no>
 Jon Loeliger <jdl@freescale.com>
 Jon Seymour <jon@blackcubes.dyndns.org>
 Jonathan Nieder <jrnieder@uchicago.edu>
-Junio C Hamano <junio@twinsun.com>
+Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
+Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
+Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
+Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
+Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
+Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
+Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
 Karl Hasselström <kha@treskal.com>
 Kent Engstrom <kent@lysator.liu.se>
 Lars Doelle <lars.doelle@on-line ! de>

-Original file line number
+Diff line change
 Jon Loeliger <[email protected]>
 Jon Seymour <[email protected]>
 Jonathan Nieder <[email protected]>
 -Junio C Hamano <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 +Junio C Hamano <[email protected]> <[email protected]>
 Karl Hasselström <[email protected]>
 Kent Engstrom <[email protected]>
 Lars Doelle <lars.doelle@on-line ! de>