From 9dd6b03ae714a2c61d6b8f1b239ebf2f9243d1ea Mon Sep 17 00:00:00 2001
From: John Peterson <jwpeterson@gmail.com>
Date: Wed, 12 Nov 2014 11:20:50 -0700
Subject: [PATCH] Adding a .mailmap file to the top level of the repo

This file helps avoid duplicate/redundant entries in the output of
'git shortlog -s'
---
 .mailmap | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000000..55e0a13caed
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+John W. Peterson <jwpeterson@gmail.com>
+John W. Peterson <jw.peterson@inl.gov>
+Roy H. Stogner <roystgnr@ices.utexas.edu>
+Roy H. Stogner <roystgnr@minerva.(none)>
+Cody Permann <codypermann@gmail.com>
+David Knezevic <david.knezevic@akselos.com>
\ No newline at end of file