From 53fe6b4427b33d522407ac1775de50ab26e97275 Mon Sep 17 00:00:00 2001 From: Alexander Dahl <alex@netz39.de> Date: Wed, 26 Feb 2025 12:31:08 +0100 Subject: [PATCH] :memo: mailmap: Merge some new identies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prefer private mail address over company mail address. Prefer netz39 mail address over private mail address. Output of `git shortlog -es` diffed: ```diff --- before 2025-02-26 12:29:28.323774025 +0100 +++ after 2025-02-26 12:30:29.355141593 +0100 @@ -1,11 +1,8 @@ 99 Alexander Dahl <alex@netz39.de> 284 David Kilias <dkdent@netz39.de> - 2 Jens Winter-Hübenthal <jens.winter-huebenthal@bridgefield.de> - 1 JensWH <jens.winter@gmail.com> - 1 MG-95 <mg-95@gitea.n39.eu> + 3 Jens Winter-Hübenthal <jens.winter@gmail.com> 4 Maximilian Deubel <maximilian.deubel@gmail.com> - 5 Maximilian Grau <mg-95@t-online.de> + 6 Maximilian Grau <mg-95@t-online.de> 259 Renovate Bot <accounts+renovatebot@netz39.de> 670 Stefan Haun <tux@netz39.de> - 1 timo <n39@therr.de> - 1 timo <timo@netz39.de> + 2 timo <timo@netz39.de> ``` --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index 60305c0..d71ca82 100644 --- a/.mailmap +++ b/.mailmap @@ -2,4 +2,8 @@ Alexander Dahl <alex@netz39.de> <post@lespocky.de> David Kilias <dkdent@netz39.de> David Kilias <dkdent@netz39.de> <david.kilias@gmail.com> Maximilian Grau <mg-95@t-online.de> +Maximilian Grau <mg-95@t-online.de> <mg-95@gitea.n39.eu> +Jens Winter-Hübenthal <jens.winter@gmail.com> +Jens Winter-Hübenthal <jens.winter@gmail.com> <jens.winter-huebenthal@bridgefield.de> Stefan Haun <tux@netz39.de> +<timo@netz39.de> <n39@therr.de>