about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-04-02 01:32:24 +0000
committerbors <bors@rust-lang.org>2023-04-02 01:32:24 +0000
commit63fdb82c44d3dfb71e5218c3946827c378fd5311 (patch)
tree12a296db37a044c3b64d18ab04dee7a4eb6b9e4b
parent0f6312f643aa1a8713e203a9ce2307f8b622b226 (diff)
parentfe42150801ec143cf1943d5c361d38b0cff9638f (diff)
downloadrust-63fdb82c44d3dfb71e5218c3946827c378fd5311.tar.gz
rust-63fdb82c44d3dfb71e5218c3946827c378fd5311.zip
Auto merge of #109834 - Nilstrieb:mailmap-myself, r=Mark-Simulacrum
Add Nilstrieb to mailmap

I saw that I'm on https://thanks.rust-lang.org/ twice (once as `Nilstrieb` and once as `nils`).

This is because I've contributed as both `Nilstrieb` (locally) and `nils` (on github). So I've mailmapped them both to `Nilstrieb` (the less ambiguous of the two).

I am not entirely sure whether I've done this correctly.
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 9148b79e980..b8a9fc27eb7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -415,6 +415,7 @@ Nick Platt <platt.nicholas@gmail.com>
 Niclas Schwarzlose <15schnic@gmail.com>
 Nicolas Abram <abramlujan@gmail.com>
 Nicole Mazzuca <npmazzuca@gmail.com>
+Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <48135649+Nilstrieb@users.noreply.github.com>
 Nif Ward <nif.ward@gmail.com>
 Nika Layzell <nika@thelayzells.com> <michael@thelayzells.com>
 NODA Kai <nodakai@gmail.com>