about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2025-01-03 22:12:42 +0100
committerGitHub <noreply@github.com>2025-01-03 22:12:42 +0100
commitd1c7ad081fc27b1e50324955a4cc634ab4b44063 (patch)
tree8dec64385dd05e629dd902e54de3c8bc34aac264
parent4cd289550fb36356f6c7a20ab84717a4c46436f3 (diff)
parented63d5ead5f44e5c1af376d7454135d006f0f0a8 (diff)
downloadrust-d1c7ad081fc27b1e50324955a4cc634ab4b44063.tar.gz
rust-d1c7ad081fc27b1e50324955a4cc634ab4b44063.zip
Rollup merge of #134965 - Noratrieb:slightly-late-for-boxing-day-sadly-but-still-almost, r=BoxyUwU
Make Boxy UwU

as requested by

r? ``@BoxyUwU``

, supersedes #129906

We need 2 entries here, the first one tells us that this email and this name is canonical for you, the second entry maps that email to your canonical email (and name).
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 87f32d28f58..eb6a9fcabca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,7 +88,8 @@ boolean_coercion <booleancoercion@gmail.com>
 Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
 bors <bors@rust-lang.org> bors[bot] <26634292+bors[bot]@users.noreply.github.com>
 bors <bors@rust-lang.org> bors[bot] <bors[bot]@users.noreply.github.com>
-Boxy <rust@boxyuwu.dev> <supbscripter@gmail.com>
+BoxyUwU <rust@boxyuwu.dev>
+BoxyUwU <rust@boxyuwu.dev> <supbscripter@gmail.com>
 Braden Nelson <moonheart08@users.noreply.github.com>
 Brandon Sanderson <singingboyo@gmail.com> Brandon Sanderson <singingboyo@hotmail.com>
 Brett Cannon <brett@python.org> Brett Cannon <brettcannon@users.noreply.github.com>