On 10/03/13 03:18, Ian Campbell wrote:

On Wed, 2013-10-02 at 17:32 -0400, Don Slutz wrote:

This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
See 'git shortlog --help'

I need this because my e-mail address has changed.

I'm not so sure about this. Linux uses this file only to correct bad
UTF-8 encoding or actual spelling errors and similar such things.

I think if you made a contribution while at verizon there's no reason
for it not to continue to appear so in the logs. Certainly we'd be
adding a tonne of admin overhead if we were to try and keep everyone's
address current, you've only scratched the surface here.

This file does not in general change the output of "git log". It can be used to do so:

don-760:~/xen>git show --pretty=format:"%h: committer=%cn <%ce> mapped to %cN <%cE>" 930b3fc8c9aafdc6723b3addc5a569dedffacc1d | head -1
930b3fc: committer=Ian Campbell <ijc@hellion.org.uk> mapped to Ian Campbell <ian.campbell@citrix.com>

Also I was just trying to get a sample together. I am fine with just a few lines.

+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>

This one seems like a good idea.

+Ian Campbell <ian.campbell@citrix.com> Ian Campbell <ijc@hellion.org.uk>

Even apart from the above this one isn't necessarily correct, it would
(sometimes) signify something I did on my own time (e.g. for Debian
purposes) rather than at work.

Ian.

How about:

From 23738ce00048bfd18703dfdcb04c88231e71a547 Mon Sep 17 00:00:00 2001
From: Don Slutz <dslutz@verizon.com>
Date: Wed, 2 Oct 2013 13:57:47 -0400
Subject: [PATCH] Add git special file .mailmap

This file is used by 'git shortlog -nse' to combine multiple e-mail address for the same person.
See 'git shortlog --help'

I need this because my e-mail address has changed.
I also added a few lines that I think are correct.

Signed-off-by: Don Slutz <dslutz@verizon.com>
---
.mailmap | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..6d51b66
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Don Slutz <dslutz@verizon.com> Don Slutz <Don@CloudSwitch.com>
+Jan Beulich <jbeulich@suse.com> Jan Beulich <none@none>
--
1.7.1