Commit Graph

66 Commits

Author SHA1 Message Date
Alex Crichton
ebe17b0c70 Rollup merge of #39348 - steveklabnik:cyryl-mailmap, r=alexcrichton
Fix cyryl's mailmap entry
2017-01-27 16:42:08 -08:00
Alex Crichton
86af9a19ec Rollup merge of #39346 - steveklabnik:jethro-mailmap, r=brson
Fix @jethrogb's mailmap entry

cc rust-lang-nursery/thanks#51
2017-01-27 16:42:07 -08:00
Steve Klabnik
810b22bdb1 Fix cyryl's mailmap entry 2017-01-27 15:28:52 -05:00
Steve Klabnik
945177de8c Fix @jethrogb's mailmap entry
cc rust-lang-nursery/thanks#51
2017-01-27 15:19:30 -05:00
Steve Klabnik
0f2a5f686f Fix up @carols10cents' mailmap entry
The previous ways didn't work; this does.

cc rust-lang-nursery/thanks#45
2017-01-27 14:29:59 -05:00
Steve Klabnik
249b444efa fix mailmap 2017-01-24 17:22:00 -05:00
Steve Klabnik
9dedc815d9 update mailmap 2017-01-13 14:24:48 -05:00
ggomez
761e26be68 Add another email address corresponding to Guillaume Gomez account 2016-02-18 11:38:59 +01:00
arcnmx
d84d92bbdd AUTHORS and .mailmap cleanup 2015-11-14 23:11:20 -05:00
Brian Anderson
93db1e2b6a Update mailmap 2015-10-28 13:40:52 -07:00
Brian Anderson
418ef78c5c Update mailmap 2015-10-28 13:28:19 -07:00
Brian Anderson
620d1ee534 Update AUTHORS.txt for 1.3 2015-08-10 15:25:32 -07:00
Brian Anderson
e7dbcf8f57 Update AUTHORS.txt for 1.2 2015-07-09 15:28:08 -07:00
Brian Anderson
2b78d9aa84 Update .mailmap 2015-06-17 16:32:02 -07:00
Jakub Bukaj
d7e910ec90 Update .mailmap 2014-10-23 23:01:31 +02:00
Ramkumar Ramachandra
50f96c1f35 .mailmap: tolerate different names, emails in shortlog
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 <artagnon@gmail.com>
2013-06-05 23:26:00 +05:30