Rollup merge of #108035 - oli-obk:oli_new_contributor_funkiness, r=Ma…

…rk-Simulacrum

Avoid using a dead email address as the main email address

This caused highfive to welcome me as a new contributor on every PR, because it couldn't find any commits of mine.

.mailmap

@@ -419,18 +419,18 @@ Nixon Enraght-Moony <[email protected]>
 NODA Kai <[email protected]>
 oliver <[email protected]>
 Oliver Middleton <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]> <public.[email protected]>
-Oliver Scherer <[email protected]> <[email protected]>
-Oliver Scherer <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]> <[email protected]>
+Oliver Scherer <[email protected]>
 Ömer Sinan Ağacan <[email protected]>
 Ophir LOJKINE <[email protected]>
 Ožbolt Menegatti <[email protected]> gareins <[email protected]>