about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-11-27 02:02:47 +0000
committerbors <bors@rust-lang.org>2023-11-27 02:02:47 +0000
commit48cfbe0cdfbc812a9bd8ce0b3bf6ca003bd12e6a (patch)
tree0fb65afabb1082ddddd8d38d00afc35add61e23d
parentac9b308133a1ed0c41e48f3fb0d5d8497aa338d3 (diff)
parent41a97888c7637e4879385778439ff1b52fb27f3e (diff)
downloadrust-48cfbe0cdfbc812a9bd8ce0b3bf6ca003bd12e6a.tar.gz
rust-48cfbe0cdfbc812a9bd8ce0b3bf6ca003bd12e6a.zip
Auto merge of #118327 - WaffleLapkin:mailmap-wl-tsk, r=Mark-Simulacrum
Add my work email to the mailmap

(my employer asks me to commit upstreaming under my work email)
-rw-r--r--.mailmap3
1 files changed, 2 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index b6f4112392d..d70a9f2aed6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -575,7 +575,8 @@ Val Markovic <val@markovic.io>
 Valerii Lashmanov <vflashm@gmail.com>
 Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com>
 Vitaly Shukela <vi0oss@gmail.com>
-Waffle Maybe <waffle.lapkin@gmail.com>
+Waffle Lapkin <waffle.lapkin@gmail.com>
+Waffle Lapkin <waffle.lapkin@tasking.com>
 Wesley Wiser <wwiser@gmail.com> <wesleywiser@microsoft.com>
 whitequark <whitequark@whitequark.org>
 William Ting <io@williamting.com> <william.h.ting@gmail.com>