summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel C. Sobral <dcsobral@gmail.com>2012-11-09 11:43:11 -0200
committerDaniel C. Sobral <dcsobral@gmail.com>2012-11-09 11:43:11 -0200
commit1236f27ac14c293b7a3dbc6368ca2d9f01dd2cb5 (patch)
tree9703e5b0c617e4a5e82c693871e7d3f1670c7767 /.mailmap
parent4f98d50bc23acab19e99d35c3e6a046a147984ba (diff)
downloadscala-1236f27ac14c293b7a3dbc6368ca2d9f01dd2cb5.tar.gz
scala-1236f27ac14c293b7a3dbc6368ca2d9f01dd2cb5.tar.bz2
scala-1236f27ac14c293b7a3dbc6368ca2d9f01dd2cb5.zip
Associate correct names to e-mails, correct or not
This is used by git log to produce names with certain formats, and is used by the release notes tool as well. Helpful if you have commits with Author not set correctly, as did I. I'm also including Aleksandar Prokopec and his friend Aleksandar Pokopec, as well as Pavel Pavlov, both of whom have commits appearing under more than one name. I'm not including others who have not set a full name, but don't have commits appearing under more than one name.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..1927f85d2e
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Aleksandar Prokopec <aleksandar@aleksandar-Latitude-E6500.(none)>
+Aleksandar Prokopec <aleksandar@htpc.(none)>
+Aleksandar Prokopec <aleksandar@htpc-axel22.(none)>
+Aleksandar Prokopec <aleksandar@lampmac14.epfl.ch>
+Aleksandar Prokopec <aleksandar.prokopec@epfl.ch>
+Daniel C. Sobral <dcs@dcs-132-CK-NF79.(none)>
+Pavel Pavlov <pavel.e.pavlov@gmail.com>