aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes1
-rw-r--r--.mailmap7
2 files changed, 8 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index e4504cf..51c6be8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
.git* export-ignore
+.mailmap export-ignore
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..87f1ee6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Enrico Tassi <Enrico.Tassi@inria.fr> <enrico.tassi@inria.fr>
+Enrico Tassi <Enrico.Tassi@inria.fr> <gares@fettunta.org>
+
+Assia Mahboubi <Assia.Mahboubi@inria.fr> <assia.mahboubi@inria.fr>
+
+Cyril Cohen <Cyril.Cohen@inria.fr> <barbichu@crans.org>
+Cyril Cohen <Cyril.Cohen@inria.fr> <cohen@crans.org>