From 290dfbab51dfcee96ddd73c24c321e86284863fc Mon Sep 17 00:00:00 2001
From: Luke Hsiao <lwhsiao@stanford.edu>
Date: Tue, 23 Jul 2019 19:33:44 -0400
Subject: [PATCH] docs: add .mailmap file to clarify git shortlog

Git supports using a .mailmap file to coalesce commits by the same
person in the shortlog, where their name and/or email address was
spelled differently [1]. This commit adds a .mailmap file for the sake
of having cleaner shortlogs (e.g., not several different entries for the
same person).

[1]: https://git-scm.com/docs/git-shortlog
---
 .mailmap | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..704d83f34
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Johannes Rausch <jrausch@inf.ethz.ch> <38429553+j-rausch@users.noreply.github.com>
+Luke Hsiao <lwhsiao@stanford.edu> <lukehsiao@users.noreply.github.com>
+Payal Bajaj <pabajaj@stanford.edu> 
+Payal Bajaj <pabajaj@stanford.edu> <pabajaj@raiders3.stanford.edu> 
+Prabh <prabhkaran.singh@ust-global.com> PK <prabhkaran.singh@ust-global.com>
+Sen Wu <senwu@cs.stanford.edu>
+Sen Wu <senwu@cs.stanford.edu> <SenWu@users.noreply.github.com>
+Sen Wu <senwu@cs.stanford.edu> <senwu@stanford.edu>