Commit Graph

45 Commits

Author SHA1 Message Date
Mazdak Farrokhzad
f6e43e8100
Rollup merge of #63600 - rust-lang:oli-obk-patch-1, r=Mark-Simulacrum
Merge oli-obk mail addresses
2019-08-30 23:07:59 +02:00
Oliver Scherer
c6e7f039aa Merge oli-obk mail addresses 2019-08-30 00:30:50 +02:00
Jeremy Stucki
2f790ee5d2
Update .mailmap 2019-08-22 16:47:42 +02:00
Jeremy Stucki
6ce242fb6e
Update .mailmap 2019-08-22 10:06:25 +02:00
Mark Rousskov
353b5d413e Fix michaelwoerister's mailmap 2019-07-01 20:23:35 -04:00
Mazdak Farrokhzad
9e97970fe2
Rollup merge of #61591 - christianpoveda:patch-1, r=jonas-schievink
Update .mailmap
2019-06-06 22:39:14 +02:00
Christian Poveda
6ba6183b1d
Update .mailmap 2019-06-06 11:52:07 -05:00
Laurențiu Nicola
2bcdee3f1e Update .mailmap with my name 2019-06-06 16:37:23 +03:00
Joseph Lyons
b0c3385a63 Alphabetized lines with Atom's Sort Lines package
https://github.com/atom/sort-lines
2019-05-28 06:42:47 -04:00
Joseph Lyons
2a6490c7ff Adding mailmap for myself 2019-05-28 06:40:41 -04:00
Joseph Lyons
7bba62c309 Fixing mailmap for Carol 2019-05-28 06:40:16 -04:00
Erin
aba152d14c
Updated my mailmap entry 2019-05-24 18:32:22 +02:00
Mateusz Mikuła
8fbe1ed6c7 Update mailmap for mati865 2019-05-10 16:47:25 +02:00
Mark Rousskov
91e0c253ed Update mailmap to proper syntax
Also updates my entry to the proper name
2019-05-05 12:06:59 -06:00
Mazdak Farrokhzad
05e8051d75
Rollup merge of #59252 - lcnr:mailmap, r=Centril
add self to mailmap
2019-03-19 15:16:57 +01:00
Bastian Kauschke
98b26728e0
update mailmap for Bastian Kauschke 2019-03-17 11:55:56 +01:00
Nathan West
8ebc609eec
Add self to mailmap 2019-03-05 13:51:18 -08:00
Melody Horn
57c4c2863d
Update contributor name in .mailmap 2019-02-04 14:43:30 -07:00
Esteban Küber
a7fbf93f0f Update mailmap for estebank 2018-10-25 17:10:34 -07:00
Christian Poveda
ad9bf17177
Update .mailmap 2018-09-21 14:02:45 -05:00
Christopher Vittal
2797fefb91 Add mailmap entry for Chris Vittal
I use both Chris and Christopher in git configs and other places.
2018-05-03 09:38:23 -04:00
Jakub Adam Wieczorek
56512971e0 Update .mailmap with my real name 2018-02-19 13:21:47 +00:00
Russell Mackenzie
9a562866b3 Fix mailmap duplicates, Carol and Brian. 2018-01-21 15:21:36 +00:00
Corey Farwell
c2009536ac Rollup merge of #43846 - frewsxcv:frewsxcv-mailmap, r=Mark-Simulacrum
Remove my mailmap entry.

I no longer want this mailmap entry for myself.
2017-08-14 20:28:45 -04:00
Corey Farwell
5d036cc8a6 Remove my mailmap entry. 2017-08-13 11:29:28 -04:00
Zack M. Davis
bc8733f806 update .mailmap 2017-07-10 14:24:48 -07:00
Martin Hafskjold Thoresen
b1ab145ec2
Fix up @martinhath's mailmap entry 2017-05-02 21:12:27 +02:00
Jan Zerebecki
0dbdb2d0d0 Fix mailmap for @gifnksm
cc rust-lang-nursery/thanks#71
2017-02-09 02:10:14 +01:00
Steve Klabnik
4b52600b15 update mailmap for @pliniker 2017-01-31 13:19:03 -05:00
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