Thanks to visit codestin.com
Credit goes to github.com

Skip to content

MNT: Mailmap fixes and simplification #5374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Dec 8, 2015
Merged

MNT: Mailmap fixes and simplification #5374

merged 3 commits into from
Dec 8, 2015

Conversation

jkseppan
Copy link
Member

Remove some duplication from git shortlog by adding new mappings and altering some mappings (the first commit), and simplify the .mailmap file by matching on email address in most cases, which allows removing some redundant mappings (the second commit; this should have no effect on the shortlog output).

I have tried to guess the preferred spelling and email address for the contributors affected by the first commit, but could have gotten it wrong. Here is a list of those contributors:

@jkseppan
Remove some duplicate contributors by editing .mailmap
f266e85
@jkseppan
Simplify .mailmap
4c55187 
It is not usually necessary to have lines like

    Firstname Lastname <[email protected]> Different Spelling <[email protected]>
    Firstname Lastname <[email protected]> Firstname Lastname <[email protected]>

They can be replaced with

    Firstname Lastname <[email protected]>
    Firstname Lastname <[email protected]> <[email protected]>

except perhaps if the email address doesn't identify a person uniquely,
such as with <userid@hostname.(none)>.

See https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html
@hodgestar
Copy link
Contributor

Mine looks good to me.

@minrk
Copy link
Contributor

minrk commented Oct 31, 2015

👍

@ericmjl
Copy link
Contributor

ericmjl commented Oct 31, 2015

my emails look good to me as well!

@curiale
Copy link
Contributor

curiale commented Oct 31, 2015

👌
On Oct 31, 2015 11:40 AM, "Jouni K. Seppänen" [email protected]
wrote:

Remove some duplication from git shortlog by adding new mappings and
altering some mappings (the first commit), and simplify the .mailmap file
by matching on email address in most cases, which allows removing some
redundant mappings (the second commit; this should have no effect on the
shortlog output).

I have tried to guess the preferred spelling and email address for the
contributors affected by the first commit, but could have gotten it wrong.
Here is a list of those contributors:

You can view, comment on, or merge this pull request online at:

#5374
Commit Summary

  • Remove some duplicate contributors by editing .mailmap
  • Simplify .mailmap

File Changes

Patch Links:

—
Reply to this email directly or view it on GitHub
#5374.

@jakevdp
Copy link
Contributor

jakevdp commented Oct 31, 2015

👍

@jlutgen
Copy link
Contributor

jlutgen commented Oct 31, 2015

My preferred address is [email protected]

Thanks.

@jaimefrio
Copy link
Contributor

+1

@endolith
Copy link
Contributor

endolith commented Nov 1, 2015

yes that's my email address

@tacaswell
Copy link
Member

Also see #4583 for preferences. I think it is safe to assume that things are the same as in July for most people.

@tacaswell tacaswell added this to the next bug fix release (2.0.1) milestone Nov 1, 2015
@jowr
Copy link
Contributor

jowr commented Nov 2, 2015

OK

@dkua
Copy link
Contributor

dkua commented Nov 2, 2015

👍

@caspervdw
Copy link
Contributor

Ok for me too

@stefanv
Copy link
Contributor

stefanv commented Nov 3, 2015

👍

1 similar comment
@leeonadoh
Copy link
Contributor

👍

@jenshnielsen
Copy link
Member

Is this ready to go?

@mdehoon
Copy link
Contributor

mdehoon commented Dec 8, 2015

OK for me.

@tacaswell
Copy link
Member

Merging as a majority of people have responded.

tacaswell added a commit that referenced this pull request Dec 8, 2015
@tacaswell
Merge pull request #5374 from jkseppan/mailmap
8c4e266 
MNT: Mailmap fixes and simplification
@tacaswell tacaswell merged commit 8c4e266 into matplotlib:master Dec 8, 2015
@jkseppan jkseppan deleted the mailmap branch April 24, 2016 15:46
@QuLogic QuLogic modified the milestones: 2.0.1 (next bug fix release), 2.0 (style change major release) Dec 7, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.