summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
committerJunio C Hamano <gitster@pobox.com>2017-11-15 12:05:04 +0900
commit266b87b90bbb1e1add42ba70d30174db8b253b2b (patch)
tree63c611923e871f68484963c598600a83d0a7c472
parent2d35c507d26061090f76a668ccfb6f2662abc004 (diff)
parentcd3f8e2fc2c90335c1b82ef041d8c03ac397eb1e (diff)
downloadgit-266b87b90bbb1e1add42ba70d30174db8b253b2b.tar.gz
Merge branch 'ks/mailmap' into maint
* ks/mailmap: mailmap: use Kaartic Sivaraam's new address
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 224db83887..7c71e88ea5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -113,6 +113,7 @@ 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@cox.net>
Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
+Kaartic Sivaraam <kaartic.sivaraam@gmail.com> <kaarticsivaraam91196@gmail.com>
Karl Wiberg <kha@treskal.com> Karl Hasselström
Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>