summaryrefslogtreecommitdiff
path: root/.mailmap
Commit message (Collapse)AuthorAgeFilesLines
* Sync with v2.0.3Junio C Hamano2014-07-231-0/+1
|\ | | | | | | | | | | | | * maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats
| * .mailmap: combine Stefan Beller's emailsStefan Beller2014-07-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Google mail has had the extension @googlemail.com for a long time in Germany as @gmail.de was already taken by a competitor. Nowadays the original gmail company isn't there anymore(?), hence Googlemail also introduced @gmail.com in Germany, which I switched to. This changed mail address of mine first appeared in 398dd4bd039680b (2014-07-10, .mailmap: map different names with the same email address together) ironically. Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | .mailmap: map different names with the same email address togetherStefan Beller2014-07-171-0/+3
|/ | | | | | | | | | | | Pretty much one year ago (94b410bba864, Jul 12 2013, .mailmap: Map email addresses to names) I cleaned up the output of `git shortlog -sne` of git.git by writing a .mailmap file fot the git.git project. During the year Jens, Kazuki and Trần contributed to git.git using different names, but the same email address; unify them. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* .mailmap: switch to Thomas Rast's personal addressThomas Rast2013-10-131-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>
* Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-131-2/+16
|\ | | | | | | | | | | * sb/mailmap-updates: .mailmap: Combine more (name, email) to individual persons .mailmap: update long-lost friends with multiple defunct addresses
| * .mailmap: Combine more (name, email) to individual personssb/mailmap-updatesStefan Beller2013-08-131-1/+3
| | | | | | | | | | Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * .mailmap: update long-lost friends with multiple defunct addressesJunio C Hamano2013-08-131-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>
* | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-091-2/+7
|\ \ | |/ | | | | | | * sb/mailmap-updates: .mailmap: fixup entries
| * .mailmap: fixup entriesStefan Beller2013-08-091-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>
* | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-08-051-0/+3
|\ \ | |/ | | | | | | * sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin
| * .mailmap: Multiple addresses of Michael S. TsirkinStefan Beller2013-08-051-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>
* | Merge branch 'sb/mailmap-updates'Junio C Hamano2013-07-301-0/+4
|\ \ | |/ | | | | | | * sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons
| * .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-241-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>
* | Merge branch 'rs/mailmap-himself'Junio C Hamano2013-07-181-1/+1
|\ \ | |/ |/| | | | | * rs/mailmap-himself: .mailmap: René Scharfe has a new email address
| * .mailmap: René Scharfe has a new email addressrs/mailmap-himselfRené Scharfe2013-07-171-1/+1
| | | | | | | | | | Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | .mailmap: combine more (email, name) to individual personsStefan Beller2013-07-171-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>
* | .mailmap: Combine more (email, name) to individual personsStefan Beller2013-07-151-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>
* | .mailmap: Map email addresses to namesStefan Beller2013-07-121-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>
* .mailmap: Map "H.Merijn Brand" to "H. Merijn Brand"Stefan Beller2013-06-251-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>
* mailmap: update Pasky's addressJunio C Hamano2013-04-041-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>
* .mailmap: normalize emails for Linus TorvaldsJeff King2012-12-121-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>
* .mailmap: normalize emails for Jeff KingJeff King2012-12-121-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>
* .mailmap: fix broken entry for Martin LanghoffJeff King2012-12-121-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>
* .mailmap: match up some obvious names/emailsJeff King2012-12-121-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>
* Update mailmap for a handful of folksJunio C Hamano2012-09-031-0/+9
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* .mailmap: unify various old mail addresses of gitsterJunio C Hamano2012-03-231-1/+7
| | | | | | "git shortlog -s -e" should show a single current address with this. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Martin Langhoff has a new e-mail addressJunio C Hamano2010-10-061-1/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'mg/mailmap-update'Junio C Hamano2010-04-031-0/+3
|\ | | | | | | | | * mg/mailmap-update: .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
| * .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" ShukelaMichael J Gruber2010-03-201-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>
* | .mailmap: Map the the first submissions of MJG by e-mailMichael J Gruber2010-03-211-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>
* Nicolas Pitre has a new email addressNicolas Pitre2009-09-141-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>
* .mailmap updateJunio C Hamano2008-07-191-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>
* Sync with 1.5.4.2 and start 1.5.5 Release NotesJunio C Hamano2008-02-171-0/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* .mailmap: adjust to a recent patch application glitch.Junio C Hamano2008-02-111-0/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* GIT 1.5.4-rc1v1.5.4-rc1Junio C Hamano2007-12-191-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>
* Update draft release notes to 1.5.4Junio C Hamano2007-12-071-0/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* RelNotes-1.5.4: describe recent updatesJunio C Hamano2007-10-291-0/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Update .mailmapJunio C Hamano2007-07-141-0/+3
| | | | | | The script "contrib/stats/mailmap.pl" found a few missed ones. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Update draft Release Notes for 1.5.3Junio C Hamano2007-07-031-0/+1
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add DLH to .mailmapJunio C Hamano2007-05-301-4/+5
| | | | ... and make the entries sorted.
* .mailmap: add some aliasesJunio C Hamano2007-05-101-0/+4
|
* Update .mailmap with "Michael"Junio C Hamano2007-04-291-0/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* .mailmap maintenance after pulling from git-svnJunio C Hamano2007-02-231-0/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* .mailmap: fix screw-ups in Uwe's nameJunio C Hamano2007-01-221-0/+2
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* add .mailmap for git-shortlog output with the git repositoryNicolas Pitre2006-12-251-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>
View Lorry Controller Status