summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-23 21:40:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-23 21:40:39 (GMT)
commiteb2c67ccbd5c6c5b7c73752dca2526bcce022b9e (patch)
tree2af47e82b265fbcff92c28db1f4c3ad725d77388
parentf47ff5afe4208488c6f977b497b81acdce941afc (diff)
downloadgit-eb2c67ccbd5c6c5b7c73752dca2526bcce022b9e.zip
git-eb2c67ccbd5c6c5b7c73752dca2526bcce022b9e.tar.gz
git-eb2c67ccbd5c6c5b7c73752dca2526bcce022b9e.tar.bz2
.mailmap: unify various old mail addresses of gitster
"git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.mailmap8
1 files changed, 7 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 19c8726..6303782 100644
--- 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>