Skip to content

Commit

Permalink
.mailmap: tolerate different names, emails in shortlog
Browse files Browse the repository at this point in the history
Write a conservative .mailmap as an example for contributors to write
their preferred names/ email addresses to.  This patch makes no
assumptions about the same author using different email addresses, and
only collects cases where the full-name of the person is spelt
differently for the same email address.  Verify with:

  $ git shortlog -se | cut -f 2 | cut -d\< -f 2 | sort | uniq -d

It only assumes that the author prefers the full-name that appears
dominantly, by number of contributions.

For the purposes of merging, a strictly alphabetical ordering is
advised.  See MAPPING AUTHORS section of git-shortlog(1) to understand
the format of this file.

Signed-off-by: Ramkumar Ramachandra <[email protected]>
  • Loading branch information
artagnon committed Jun 5, 2013
1 parent 38b1d60 commit 50f96c1
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#
# This list is used by git-shortlog to aggregate contributions. It is
# necessary when either the author's full name is not always written
# the same way, and/or the same author contributes from different
# email addresses.
#

Elly Jones <[email protected]>
ILyoan <[email protected]>
Junyoung Cho <[email protected]>
Matthijs Hofstra <[email protected]>
Rob Arnold <[email protected]>

5 comments on commit 50f96c1

@bors
Copy link
Contributor

@bors bors commented on 50f96c1 Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 50f96c1 Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging artagnon/rust/mailmap = 50f96c1 into auto

@bors
Copy link
Contributor

@bors bors commented on 50f96c1 Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

artagnon/rust/mailmap = 50f96c1 merged ok, testing candidate = c5fea4a

@bors
Copy link
Contributor

@bors bors commented on 50f96c1 Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 50f96c1 Jun 5, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = c5fea4a

Please sign in to comment.