about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-03-22 20:31:30 +0100
committerGitHub <noreply@github.com>2024-03-22 20:31:30 +0100
commit5624af3640a39bf1ff51ece624932b152df299fa (patch)
tree1db676abc26bb3bb61fc6e9cad2d72b46d7b6292
parent80306927cff828a45f84dc5ec0638ed38a648be7 (diff)
parent1590026f032b5e867b1b5fc8bc37bbc85871dea4 (diff)
downloadrust-5624af3640a39bf1ff51ece624932b152df299fa.tar.gz
rust-5624af3640a39bf1ff51ece624932b152df299fa.zip
Rollup merge of #122873 - badboy:mailmap-mail-merge, r=Mark-Simulacrum
Merge my contributor emails into one using mailmap
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index f37ac7609e0..0d96f5f3d4f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -259,6 +259,7 @@ James Hinshelwood <jameshinshelwood1@gmail.com> <james.hinshelwood@bigpayme.com>
 James Miller <bladeon@gmail.com> <james@aatch.net>
 James Perry <james.austin.perry@gmail.com>
 James Sanderson <zofrex@gmail.com>
+Jan-Erik Rediger <janerik@fnordig.de> <badboy@archlinux.us>
 Jaro Fietz <jaro.fietz@gmx.de>
 Jason Fager <jfager@gmail.com>
 Jason Liquorish <jason@liquori.sh> <Bassetts@users.noreply.github.com>