summaryrefslogtreecommitdiff
path: root/.mailmap
AgeCommit message (Collapse)Author
2013-04-04mailmap: update Pasky's addressJunio C Hamano
Eric Wong noticed that the address at suse.cz no longer works. We may want to update in-code addresses as well, but let's do this first in 'maint'. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-12.mailmap: normalize emails for Linus TorvaldsJeff King
Linus used a lot of different per-machine email addresses in the early days. This means that "git shortlog -nse" does not aggregate his counts, and he is listed well below where he should be (8th instead of 3rd). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-12.mailmap: normalize emails for Jeff KingJeff King
I never meant anything special by using my @github.com address; it is merely a mistake that it has sometimes bled through to patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-12.mailmap: fix broken entry for Martin LanghoffJeff King
Commit adc3192 (Martin Langhoff has a new e-mail address, 2010-10-05) added a mailmap entry, but forgot that both the old and new email addresses need to appear for one to be mapped to the other (i.e., we do not key mailmap emails by name). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-12-12.mailmap: match up some obvious names/emailsJeff King
This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-09-03Update mailmap for a handful of folksJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-23.mailmap: unify various old mail addresses of gitsterJunio C Hamano
"git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-10-06Martin Langhoff has a new e-mail addressJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-03Merge branch 'mg/mailmap-update'Junio C Hamano
* mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
2010-03-21.mailmap: Map the the first submissions of MJG by e-mailMichael J Gruber
so that git shortlog with '-e' coalesces all my commits. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-21.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber
With the current .mailmap, git shortlog shows the following for these: 11 Deskin Miller 3 Vitaly \"_Vi\" Shukela 1 Alex Bennee 1 Alex Bennée 1 Deskin Miler 1 Vitaly _Vi Shukela Add (e-mail based qualified) entries to .mailmap to get: 12 Deskin Miller 4 Vitaly "_Vi" Shukela 2 Alex Bennée The Shukela spelling is based on the version used consistently in the s-o-b lines of all his patches. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-14Nicolas Pitre has a new email addressNicolas Pitre
Due to problems at cam.org, my nico@cam.org email address is no longer valid. From now on, nico@fluxnic.net should be used instead. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-19.mailmap updateJunio C Hamano
A few people sent in patches under slightly different spelling recently. Hopefully this catches most of them if not all (with help from Dscho). Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-17Sync with 1.5.4.2 and start 1.5.5 Release NotesJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-12.mailmap: adjust to a recent patch application glitch.Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-20GIT 1.5.4-rc1v1.5.4-rc1Junio C Hamano
It's been a week since -rc0, and we have quite a lot of fixes, so here it is. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-07Update draft release notes to 1.5.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-10-29RelNotes-1.5.4: describe recent updatesJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-14Update .mailmapJunio C Hamano
The script "contrib/stats/mailmap.pl" found a few missed ones. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-04Update draft Release Notes for 1.5.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-05-30Add DLH to .mailmapJunio C Hamano
... and make the entries sorted.
2007-05-10.mailmap: add some aliasesJunio C Hamano
2007-04-29Update .mailmap with "Michael"Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-23.mailmap maintenance after pulling from git-svnJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-23.mailmap: fix screw-ups in Uwe's nameJunio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-26add .mailmap for git-shortlog output with the git repositoryNicolas Pitre
The git repository itself was messed up in a couple cases. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v0.10.2-6-g49f6 at 2024-04-27 21:07:20 (GMT)