about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJacob Pratt <jacob@jhpratt.dev>2024-04-13 00:18:47 -0400
committerGitHub <noreply@github.com>2024-04-13 00:18:47 -0400
commit1a75ce07f4994c11cb652745ea3f1897ed3318ee (patch)
treeff8ba804503a7ff9e6e2ee81bfda5047666cedee
parent79df0cfe72dc794211ca394598795ba81b3161e8 (diff)
parenta7201db04bf1e3a424cd0a3a75ccff56401f2401 (diff)
downloadrust-1a75ce07f4994c11cb652745ea3f1897ed3318ee.tar.gz
rust-1a75ce07f4994c11cb652745ea3f1897ed3318ee.zip
Rollup merge of #123873 - cuviper:mailmap, r=lqd
Merge cuviper in the mailmap

These emails are associated with my GitHub account already, but I might as well
combine my activity for stuff like the Thanks page too.
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 6ee765533f8..0bd16a797ca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -307,6 +307,8 @@ Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
 Josh Cotton <jcotton42@outlook.com>
 Josh Driver <keeperofdakeys@gmail.com>
 Josh Holmer <jholmer.in@gmail.com>
+Josh Stone <cuviper@gmail.com> <jistone@redhat.com>
+Josh Stone <cuviper@gmail.com> <jistone@fedoraproject.org>
 Julian Knodt <julianknodt@gmail.com>
 jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
 Junyoung Cho <june0.cho@samsung.com>