aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-01-12 05:19:52 -0800
committerJunio C Hamano <gitster@pobox.com>2026-01-12 05:19:52 -0800
commit5323fafdf4f90625b3d2e5c19c0385f27a8653c3 (patch)
tree90957ffb0776a8a788fc1237e0d33759bfdf864a
parent6506be0304db27fa6f15877a3e0d0cae0e49a178 (diff)
parente97678c4efe315e2bdae7eb28ccff8f4203c650b (diff)
downloadgit-5323fafdf4f90625b3d2e5c19c0385f27a8653c3.tar.xz
Merge branch 'js/mailmap-karsten-blees'
Mailmap update for Karsten * js/mailmap-karsten-blees: .mailmap: replace Karsten Blees' default address
-rw-r--r--.mailmap4
1 files changed, 2 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 7b3198171f..3cf26b1add 100644
--- a/.mailmap
+++ b/.mailmap
@@ -140,8 +140,8 @@ 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>
-Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
+Karsten Blees <karsten.blees@gmail.com> <karsten.blees@dcon.de>
+Karsten Blees <karsten.blees@gmail.com> <blees@dcon.de>
Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com>