Contributors, please check your names

A handy way to look at the list of contributors is:

	$ git shortlog -s --since=6.month

This shows the number of patches in our history for each contributor.  The
patch author name (excluding e-mail part) is used for summarizing, and
this allows the same person to send patches under more than one e-mail
address and still count these patches as authored by one person.

Your name however can appear more than once in different spellings, if you
sent patches using different human-readable names on From: line of your
patch submission from the same (or different) e-mail address.  E.g. these
two patches are counted under different authors:

	Author: A. U. Thor [off-list ref]
        Date:   Wed Jul 09:23:06 2008 -0700

	The first patch...

        Author: A U Thor [off-list ref]
        Date:   Wed Jul 09:23:07 2008 -0700

	The second patch...

There is a "mailmap" mechanism to consolidate them; it allows us to
specify what human-readable name should be used for given e-mail address.
The hypothetical Mr. Thor might want to say "I am A. U. Thor; some commits
from me, [off-list ref], are marked without abbreviating periods in
my name", and we can add this entry to the toplevel .mailmap file to fix
it:

	A. U. Thor [off-list ref]

It tells the shortlog (and --pretty=format:%aN in recent enough git)
mechanism to give huma readable name "A. U. Thor" anytime it sees
[off-list ref] e-mail address, regardless of what the Author:
header in the commit object says.

If your name appears more than once in the output from the "shortlog"
command at the beginning of this message, you may want to tell me to fix
it.

Thanks.

Signed-off-by: Johannes Schindelin <redacted>
---

	I hope that my mailer does not break UTF-8 encoded names...

 .mailmap |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/.mailmap b/.mailmap
index f88ae77..ca2e17e 100644
--- a/.mailmap
+++ b/.mailmap

@@ -5,22 +5,28 @@
 # same person appearing not to be so.
 #
 
+Alexander N. Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
 Chris Shoemaker <c.shoemaker@cox.net>
 Dana L. How <danahow@gmail.com>
 Dana L. How <how@deathvalley.cswitch.com>
 Daniel Barkalow <barkalow@iabervon.org>
+David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
+David S. Miller <davem@davemloft.net>
+Dirk Süsserott <newsletter@dirk.my1.cc>
 Fredrik Kuivinen <freku045@student.liu.se>
 H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
 H. Peter Anvin <hpa@tazenda.sc.orionmulti.com>
 H. Peter Anvin <hpa@trantor.hos.anvin.org>
 Horst H. von Brand <vonbrand@inf.utfsm.cl>
+İsmail Dönmez <ismail@pardus.org.tr>
 Jay Soffian <jaysoffian+git@gmail.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Jon Loeliger <jdl@freescale.com>
 Jon Seymour <jon@blackcubes.dyndns.org>
+Jonathan Nieder <jrnieder@uchicago.edu>
 Junio C Hamano <junio@twinsun.com>
 Karl Hasselström <kha@treskal.com>
 Kent Engstrom <kent@lysator.liu.se>

@@ -30,9 +36,11 @@ Li Hong <leehong@pku.edu.cn>
 Lukas Sandström <lukass@etek.chalmers.se>
 Martin Langhoff <martin@catalyst.net.nz>
 Michael Coleman <tutufan@gmail.com>
+Michael W. Olson <mwolson@gnu.org>
 Michele Ballabio <barra_cuda@katamail.com>
 Nanako Shiraishi <nanako3@bluebottle.com>
 Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
+Philippe Bruhat (BooK) <book@cpan.org>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>

-- 
1.5.6.3.626.gf5cf.dirty

Junio C Hamano [off-list ref] writes:

There is a "mailmap" mechanism to consolidate them; it allows us to
specify what human-readable name should be used for given e-mail address.
The hypothetical Mr. Thor might want to say "I am A. U. Thor; some commits
from me, [off-list ref], are marked without abbreviating periods in
my name", and we can add this entry to the toplevel .mailmap file to fix
it:

	A. U. Thor [off-list ref]

It tells the shortlog (and --pretty=format:%aN in recent enough git)
mechanism to give huma readable name "A. U. Thor" anytime it sees
[off-list ref] e-mail address, regardless of what the Author:
header in the commit object says.

What about if some authors use different _email_ address, instead?
Is there any way for shortlog to consider them the same?

-- 
Jakub Narebski
Poland
ShadeHawk on #git

On Thu, 17 Jul 2008, Jakub Narebski wrote:

Junio C Hamano [off-list ref] writes:

quoted

There is a "mailmap" mechanism to consolidate them; it allows us to
specify what human-readable name should be used for given e-mail address.
The hypothetical Mr. Thor might want to say "I am A. U. Thor; some commits
from me, [off-list ref], are marked without abbreviating periods in
my name", and we can add this entry to the toplevel .mailmap file to fix
it:

	A. U. Thor [off-list ref]

It tells the shortlog (and --pretty=format:%aN in recent enough git)
mechanism to give huma readable name "A. U. Thor" anytime it sees
[off-list ref] e-mail address, regardless of what the Author:
header in the commit object says.

What about if some authors use different _email_ address, instead?
Is there any way for shortlog to consider them the same?

It already does, unless you use the -e switch.


Nicolas