Commit graph

4 commits

Author SHA1 Message Date
53fe6b4427 📝 mailmap: Merge some new identies
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>
```
2025-02-27 21:59:00 +01:00
1e1a95a87c 📝 mailmap: Expand alias to real name
with consent according to
https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/129/files#issuecomment-3445
2022-12-31 10:43:16 +01:00
96d52a5692 🔧 mailmap: Update with new mail addresses
Since introduction some commits with wrong mail addresses or names
happened.  Diff:

    --- shortlog-before     2022-12-21 06:45:53.106645799 +0100
    +++ shortlog-after      2022-12-21 06:46:03.478187832 +0100
    @@ -1,7 +1,5 @@
    -    48 Alexander Dahl <alex@netz39.de>
    -     6 Alexander Dahl <post@lespocky.de>
    +    54 Alexander Dahl <alex@netz39.de>
        115 David Kilias <dkdent@netz39.de>
    -     1 MG-5 <mg-95@t-online.de>
    -     2 MG-95 <mg-95@t-online.de>
    +     3 MG-95 <mg-95@t-online.de>
          4 Maximilian Deubel <maximilian.deubel@gmail.com>
        381 Stefan Haun <tux@netz39.de>
2022-12-21 06:47:51 +01:00
83b2236917 Introduce gitmailmap
Unifies author/committer names for log and shortlog, see shortlog for
example, before:

    % git shortlog -es
        45  Alexander Dahl <alex@netz39.de>
        62  David Kilias <david.kilias@gmail.com>
        12  David Kilias <dkdent@netz39.de>
         4  Maximilian Deubel <maximilian.deubel@gmail.com>
       255  Stefan Haun <tux@netz39.de>
        12  dkdent <dkdent@netz39.de>
        72  tux <tux@netz39.de>

After:

    % git shortlog -es
        45  Alexander Dahl <alex@netz39.de>
        86  David Kilias <dkdent@netz39.de>
         4  Maximilian Deubel <maximilian.deubel@gmail.com>
       327  Stefan Haun <tux@netz39.de>

So everyone shows up only once.  Also makes `git log` better readable.

Link: https://git-scm.com/docs/gitmailmap
2022-10-26 21:45:47 +02:00