aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
AgeCommit message (Collapse)Author
2026-03-09.mailmap: update email address for Tian YuchenTian Yuchen
Map my old Gmail address to my new custom address in .mailmap. Signed-off-by: Tian Yuchen <a3205153416@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2026-02-03.mailmap: fix email for Phil HordPhil Hord
My canonical and old emails were reversed, somehow. Also add an entry for a new email that may sneak in. Signed-off-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2026-01-23Merge branch 'pw/mailmap-self'Junio C Hamano
Unify entries in .mailmap file for Phillip Wood. * pw/mailmap-self: mailmap: add an entry for Phillip Wood
2026-01-21.mailmap: fix and expand mappings for Jean-Noël AvilaKristoffer Haugsbakk
The latest release candidate notes say that there is a new contributor: Jean-Noël Avila via GitGitGadget, ... But this is a familiar face, just in a G.G. Gadget trench coat. Also map the rest of the idents in the history. Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2026-01-20mailmap: add an entry for Phillip WoodPhillip Wood
While all my commits appear under the same address, other addresses appear in some commit trailers. Map those addresses to the canonical one. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2026-01-10.mailmap: replace Karsten Blees' default addressJohannes Schindelin
As per a recent email by Karsten, the @dcon.de address no longer works: https://lore.kernel.org/git/77e768b2-6693-454f-9e11-fb0acdec703c@gmail.com Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-07mailmap: change primary address for Jonathan TanJonathan Tan
Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-09-16mailmap: consolidate multiple addresses into oneGreg Hurrell
Merges contributions made from three different addresses: - win@wincent.com (old address, initial contributions in 2007–2009) - greg@hurrell.net (personal address matching full name, so this one is the "forever" address; contributions made starting in 2018) - greg.hurrell@datadoghq.com (current work address, used for recent contributions) Signed-off-by: Greg Hurrell <greg.hurrell@datadoghq.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-09-06.mailmap document current address.Stephen P. Smith
Cox Communications no longer supports email and transfered accounts to yahoo. I closed the account at yahoo since I use gmail.com. Signed-off-by: Stephen P. Smith <ishchis2@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-04-16mailmap: change primary address for Linus ArverLinus Arver
Linus will lose access to his work email soon. Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-10-12mailmap: change primary address for Derrick StoleeDerrick Stolee
The previous primary address is no longer valid. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-08-07mailmap: change primary address for Glen ChooGlen Choo
Glen will lose access to his work email soon. Signed-off-by: Glen Choo <chooglen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-04-07mailmap: change primary address for Emily ShafferEmily Shaffer
Emily finally figured out how to set up their alias at DayJob, and would prefer to use nasamuffin@google.com, partially to reduce confusion between IRC and list, and partially because they just like the alias a lot more. Signed-off-by: Emily Shaffer <nasamuffin@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-12-10mailmap: update email address of Matheus TavaresMatheus Tavares
I haven't been very active in the community lately, but I'm soon going to lose access to my previous commit email (@usp.br); so add my current personal address to mailmap for any future message exchanges or patch contributions. Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-02-14mailmap: change primary address for Derrick StoleeDerrick Stolee
Stolee transitioned from Microsoft to GitHub in July 2020, but continued to use <dstolee@microsoft.com> because it was a valid address. He also used <stolee@gmail.com> to communicate with the mailing list since writing plaintext emails is difficult in Outlook. However, recent issues with GMail delaying mailing list messages created a need to change his primary email address. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-03-08Add entry for Ramkumar RamachandraRamkumar Ramachandra
Signed-off-by: Ramkumar Ramachandra <r@artagnon.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-03-05Merge branch 'bc/wildcard-credential'Junio C Hamano
A configuration element used for credential subsystem can now use wildcard pattern to specify for which set of URLs the entry applies. * bc/wildcard-credential: credential: allow wildcard patterns when matching config credential: use the last matching username in the config t0300: add tests for some additional cases t1300: add test for urlmatch with multiple wildcards mailmap: add an additional email address for brian m. carlson
2020-02-20mailmap: add an additional email address for brian m. carlsonbrian m. carlson
To more accurately track the provenance of contributions, brian uses a work email address for commits created at work. Add this email address to .mailmap so that contributions are properly attributed to the same person. Signed-off-by: brian m. carlson <bk2204@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-30Sync with maintJunio C Hamano
* maint: .mailmap: map Yi-Jyun Pan's email
2020-01-30Merge branch 'ds/sparse-cone'Junio C Hamano
The code recently added in this release to move to the entry beyond the ones in the same directory in the index in the sparse-cone mode did not count the number of entries to skip over incorrectly, which has been corrected. * ds/sparse-cone: .mailmap: fix GGG authoship screwup unpack-trees: correctly compute result count
2020-01-30.mailmap: map Yi-Jyun Pan's emailDenton Liu
In 13185fd241 (l10n: zh_TW.po: update translation for v2.25.0 round 1, 2019-12-31), the author mistakenly used their GitHub username for authorship information instead of their real name. However, a commit with their real name exists prior to this: 9917eca794 (l10n: zh_TW: add translation for v2.24.0, 2019-11-20). Map their email to their real name so that these contributions can be counted together. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-27.mailmap: fix GGG authoship screwupJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-27.mailmap: fix erroneous authorship for Johannes SchindelinDenton Liu
In 49e268e23e (mingw: safeguard better against backslashes in file names, 2020-01-09), the commit author is listed as "Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>", which is erroneous. Fix the authorship by mapping the erroneous authorship to his canonical authorship information. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-26mailmap: mask accentless variant for Công DanhJunio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-09-20.mailmap: update email address of Andrey MazoAndrey Mazo
I don't have access to my old work email since 20 Apr 2019. Replace with my personal email address. Signed-off-by: Andrey Mazo <ahippo@yandex.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-08-11.mailmap: update email address of Philip OakleyPhilip Oakley
My IEE 'home for life' email service is being withdrawn on 30 Sept 2019. Replace with my new email domain. I also have a secondary (backup) 'home for life' through <philipoakley@dunelm.org.uk>. Signed-off-by: Philip Oakley <philipoakley@iee.email> Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-08.mailmap: map Clemens Buchacher's mail addressesJohannes Schindelin
We have three email addresses for Clemens in our commit history, two of them bouncing. Let's map the latter to the only one that still works. Pointed out by Gábor Szeder. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-12-09mailmap: update brandon williams's email addressBrandon Williams
Signed-off-by: Brandon Williams <bwilliams.eng@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-11-12Update .mailmapJohannes Schindelin
This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing the current and preferred addresses for authors that appear with more than one address. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-10-16Merge branch 'jn/mailmap-update'Junio C Hamano
The mailmap file update. * jn/mailmap-update: mailmap: consistently normalize brian m. carlson's name
2018-09-25mailmap: consistently normalize brian m. carlson's nameJonathan Nieder
v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address, 2018-05-08) changed the mailmap to map sandals@crustytoothpaste.ath.cx -> brian m. carlson <sandals@crustytoothpaste.net> instead of sandals@crustytoothpaste.net -> brian m. carlson <sandals@crustytoothpaste.ath.cx> That means the mapping Brian M. Carlson <sandals@crustytoothpaste.ath.cx> -> brian m. carlson <sandals@crustytoothpaste.net> is redundant, so we can remove it. More importantly, it means that the identity "Brian M. Carlson <sandals@crustytoothpaste.net>" used in some commits is not normalized any more. Add a mapping for it. Noticed while updating Debian's Git packaging, which uses "git shortlog --no-merges" to produce a list of changes in each version, grouped by author's (normalized) name. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-29.mailmap: merge different spellings of namesStefan Beller
This is a continuation of 94b410bba86 (.mailmap: Map email addresses to names, 2013-07-12), merging names that are spelled differently but have the same author email to the same person. Most spellings differed in accents or the order of names. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-05-08mailmap: update brian m. carlson's email addressbrian m. carlson
An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to individual persons", 2013-08-12), noted that there were two name spellings and two email addresses and mapped the crustytoothpaste.net address to the crustytoothpaste.ath.cx address. The latter is an older, obsolete address, while the former is current, so switch the order of the addresses so that git log displays the correct address. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-11-03mailmap: use Kaartic Sivaraam's new addressKaartic Sivaraam
Map the old address to the new, hopefully more permanent one. Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-10-06.mailmap: normalize name for René ScharfeRené Scharfe
Reported-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reported-by: Stefan Beller <sbeller@google.com> Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-03-24Sync with 2.12.2Junio C Hamano
2017-03-24mailmap: use Michael J Gruber's new addressMichael J Gruber
Map both old addresses to the new, hopefully more permanent one. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-02-27Merge branch 'ps/urlmatch-wildcard'Junio C Hamano
The <url> part in "http.<url>.<variable>" configuration variable can now be spelled with '*' that serves as wildcard. E.g. "http.https://*.example.com.proxy" can be used to specify the proxy used for https://a.example.com, https://b.example.com, etc., i.e. any host in the example.com domain. * ps/urlmatch-wildcard: urlmatch: allow globbing for the URL host part urlmatch: include host in urlmatch ranking urlmatch: split host and port fields in `struct url_info` urlmatch: enable normalization of URLs with globs mailmap: add Patrick Steinhardt's work address
2017-02-02Merge branch 'sg/mailmap-self'Junio C Hamano
* sg/mailmap-self: .mailmap: update Gábor Szeder's email address
2017-01-31.mailmap: update Gábor Szeder's email addressSZEDER Gábor
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-31mailmap: add Patrick Steinhardt's work addressPatrick Steinhardt
Signed-off-by: Patrick Steinhardt <patrick.steinhardt@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-01-10.mailmap: record canonical email for Richard HansenRichard Hansen
When I changed employers my work address changed from rhansen@bbn.com to hansenr@google.com. Rather than map my old work address to my new, map them both to my permanent personal email address. (I will still use my work address in commits I submit so that my employer gets some credit.) Signed-off-by: Richard Hansen <hansenr@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-26add David Turner's Two Sigma addressDavid Turner
Signed-off-by: David Turner <novalis@novalis.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-08.mailmap: use Christian Couder's Tuxfamily addressChristian Couder
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-06mailmap: use main email address for dturnerDavid Turner
Signed-off-by: David Turner <novalis@novalis.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-02.mailmap: update to my shorter email addressEric Wong
Following f916ab0ccc ("send-email: more meaningful Message-ID"), my own email address is too long :x While I could have an even shorter address by one character with "yhbt.net", "80x24.org" is more representative of my hacking-related pursuits. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-09-16mailmap: update my entry with new email addressRamsay Jones
My 'demon' email address is no longer functional since, after 16+ years with demon, I have had to change my ISP. :( Also, take the opportunity to remove my middle name, which I only use on official documents (or in the GECOS field when creating a user account on unix). Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-03-27Update mailmap to spell out "Alexander Kuleshov"Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-10-21.mailmap: add Stefan Bellers corporate mail addressStefan Beller
Note that despite the private address being first and primary, Google owns the copyright on this patch as any other patch I'll be sending signed off by the sbeller@google.com address. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-07-23Sync with v2.0.3Junio C Hamano
* maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats