summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJon Roelofs <jonathan_roelofs@apple.com>2021-06-09 18:35:13 -0700
committerJon Roelofs <jonathan_roelofs@apple.com>2021-06-09 18:36:22 -0700
commit047f6d99158caeeb033986d44265bde5b3339228 (patch)
tree611f2a514cc574ccd3fc1ded0ec59ce25354ec81 /.mailmap
parentb0eb3919835a7bb57cb28ae684d77fece8ff025c (diff)
downloadllvm-047f6d99158caeeb033986d44265bde5b3339228.tar.gz
Add .mailmap entries for myself, and sort the list
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 5 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 3203af474e0f..28380a8dd6ce 100644
--- a/.mailmap
+++ b/.mailmap
@@ -22,7 +22,10 @@
#
# Please keep this file sorted.
-Martin Storsjö <martin@martin.st>
+<i@maskray.me> <maskray@google.com>
<rnk@google.com> <reid@kleckner.net>
<thakis@chromium.org> <nicolasweber@gmx.de>
-<i@maskray.me> <maskray@google.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jon Roelofs <jroelofs@jroelofs.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jonathan@codesourcery.com>
+Jon Roelofs <jonathan_roelofs@apple.com> Jonathan Roelofs <jroelofs@jroelofs.com>
+Martin Storsjö <martin@martin.st>