summaryrefslogtreecommitdiff
path: root/.mailmap
AgeCommit message (Collapse)AuthorFilesLines
2013-10-13.mailmap: switch to Thomas Rast's personal addressLibravatar Thomas Rast1-1/+3
Normalize to my personal address, as my ETH addresses will expire soon. Also add my new corp account to be somewhat futureproof. Note that despite the private address being first, Google owns the copyright as long as I am employed there. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2013-08-13Merge branch 'sb/mailmap-updates'Libravatar Junio C Hamano1-2/+16
* sb/mailmap-updates: .mailmap: Combine more (name, email) to individual persons .mailmap: update long-lost friends with multiple defunct addresses
2013-08-13.mailmap: Combine more (name, email) to individual personsLibravatar Stefan Beller1-1/+3
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-13.mailmap: update long-lost friends with multiple defunct addressesLibravatar Junio C Hamano1-1/+13
A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliverable. With a lot of help from Jonathan, we located all of them except for one person, and a pair of addresses we suspect belong to a single person but we are not certain. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost one. Helped-by: Stefan Beller <stefanbeller@googlemail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-09Merge branch 'sb/mailmap-updates'Libravatar Junio C Hamano1-2/+7
* sb/mailmap-updates: .mailmap: fixup entries
2013-08-09.mailmap: fixup entriesLibravatar Stefan Beller1-2/+7
This patch adds no new names, but fixes the mistakes I made in the previous commits. (94b410bba8, f4f49e225, c07a6bc57, 2013-07-12, .mailmap: Map email addresses to names). These mistakes are double white spaces between name and surname, different capitalization in email address, or just the email address set as name. Also I forgot to include James Knight to the mailmap file. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-05Merge branch 'sb/mailmap-updates'Libravatar Junio C Hamano1-0/+3
* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin
2013-08-05.mailmap: Multiple addresses of Michael S. TsirkinLibravatar Stefan Beller1-0/+3
Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-30Merge branch 'sb/mailmap-updates'Libravatar Junio C Hamano1-0/+4
* sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons
2013-07-24.mailmap: combine more (email, name) to individual personsLibravatar Stefan Beller1-0/+4
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-18Merge branch 'rs/mailmap-himself'Libravatar Junio C Hamano1-1/+1
* rs/mailmap-himself: .mailmap: René Scharfe has a new email address
2013-07-17.mailmap: combine more (email, name) to individual personsLibravatar Stefan Beller1-3/+7
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-17.mailmap: René Scharfe has a new email addressLibravatar René Scharfe1-1/+1
Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-15.mailmap: Combine more (email, name) to individual personsLibravatar Stefan Beller1-7/+35
I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. It's mostly email mappings again. However we also have Nick Stokoe, who contributed as Nick Woolley. He changed his name, but kept the email. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12.mailmap: Map email addresses to namesLibravatar Stefan Beller1-25/+110
People change email addresses quite often and sometimes forget to add their entry to the mailmap file. I have contacted lots of people, whose name occurs multiple times in the short log having different email addresses. The entries in the mailmap of this patch are either confirmed by them or are trivial. Trivial means different capitalisation of the domain (@MIT.EDU and @mit.edu) or the domain was localhost, (none) or @local. Additionally to adding (name, email) mappings to the .mailmap file, it has also been sorted ("LC_ALL=C /usr/bin/sort", byte-value sort). While the most changes happen at the email addresses, we also have a name change in here. Karl Hasselström is now known as Karl Wiberg due to marriage. Congratulations! To find out whom to contact I used the following small script: #!/bin/bash git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d > mailmapdoubles while read line ; do # remove leading whitespace trimmed=$(echo $line | sed -e 's/^ *//g' -e 's/ *$//g') echo "git shortlog -sne | grep \""$trimmed"\"" done < mailmapdoubles > mailmapdoubles2 sh mailmapdoubles2 rm mailmapdoubles rm mailmapdoubles2 Also interesting for similar tasks are these snippets: # Finding out duplicates by comparing email addresses: git shortlog -sne |awk '{ print $NF }' |sort |uniq -d # Finding out duplicates by comparing names: git shortlog -sne |awk '{ NF--; $1=""; print }' |sort |uniq -d Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-06-25.mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"Libravatar Stefan Beller1-0/+1
This patch was created by searching for duplicates of email addresses in the shortlog by git shortlog -sne |awk '{ print $NF }' |sort |uniq -d This will yield all email addresses, which are found multiple times within the shortlog. We can assume that commiters having the same email address are indeed the same person. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-04mailmap: update Pasky's addressLibravatar Junio C Hamano1-0/+1
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 TorvaldsLibravatar Jeff King1-0/+6
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 KingLibravatar Jeff King1-0/+1
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 LanghoffLibravatar Jeff King1-1/+1
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/emailsLibravatar Jeff King1-0/+10
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 folksLibravatar Junio C Hamano1-0/+9
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-03-23.mailmap: unify various old mail addresses of gitsterLibravatar Junio C Hamano1-1/+7
"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 addressLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-04-03Merge branch 'mg/mailmap-update'Libravatar Junio C Hamano1-0/+3
* 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-mailLibravatar Michael J Gruber1-0/+1
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-20.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaLibravatar Michael J Gruber1-0/+3
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 addressLibravatar Nicolas Pitre1-0/+1
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 updateLibravatar Junio C Hamano1-0/+9
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 NotesLibravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-11.mailmap: adjust to a recent patch application glitch.Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-12-19GIT 1.5.4-rc1Libravatar Junio C Hamano1-0/+1
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.4Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-10-29RelNotes-1.5.4: describe recent updatesLibravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-14Update .mailmapLibravatar Junio C Hamano1-0/+3
The script "contrib/stats/mailmap.pl" found a few missed ones. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-03Update draft Release Notes for 1.5.3Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-05-30Add DLH to .mailmapLibravatar Junio C Hamano1-4/+5
... and make the entries sorted.
2007-05-10.mailmap: add some aliasesLibravatar Junio C Hamano1-0/+4
2007-04-29Update .mailmap with "Michael"Libravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-23.mailmap maintenance after pulling from git-svnLibravatar Junio C Hamano1-0/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-22.mailmap: fix screw-ups in Uwe's nameLibravatar Junio C Hamano1-0/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-12-25add .mailmap for git-shortlog output with the git repositoryLibravatar Nicolas Pitre1-0/+37
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 v1.2.3 (git 2.25.1) at 2024-11-01 05:37:34 +0000