Skip to content

Mailmap updates - #7127

Merged
QuLogic merged 4 commits into
matplotlib:v1.5.3-docfrom
QuLogic:mailmap-updates
Oct 2, 2016
Merged

QuLogic merged 4 commits into
matplotlib:v1.5.3-docfrom
QuLogic:mailmap-updates

Conversation

@QuLogic

@QuLogic QuLogic commented Sep 18, 2016 •

Copy link
Copy Markdown
Member

I'm pulling this back as far as possible to keep everything in sync; there may be some conflicts when propagating branches forward, but this version is intended to supersede all copies.

For those of you wondering why you are being tagged here, the .mailmap file ensures that you will be counted as a single person as part of matplotlib's GitHub stats. Please confirm that your name and email (the first entry on a line) are the way you want to be listed. As there are some layout changes to this file in this PR, you may want to check only the last commit which only contains the addition of your names.

@afvincent

Copy link
Copy Markdown
Contributor

@QuLogic : my entry is fine, thank you.

@kthyng

kthyng commented Sep 18, 2016

Copy link
Copy Markdown
Contributor

@QuLogic mine is good, thanks!

On Sun, Sep 18, 2016 at 8:20 AM, Adrien F. Vincent <notifications@github.com

wrote:

@QuLogic https://github.com/QuLogic : my entry is fine, thank you.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#7127 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ADU2Bf9lSR64d26lvrxrmLqZuDHLYroUks5qrTqQgaJpZM4J_zdC
.

Kristen M. Thyng
Assistant Research Professor
Department of Oceanography
Texas A&M University
Eller O&M 607
http://kristenthyng.com

@rasbt

rasbt commented Sep 18, 2016

Copy link
Copy Markdown
Contributor

@QuLogic Thanks for the note. Instead of listing me as "rasbt," it would look nicer if you could list me as Sebastian Raschka. Thanks!

@klaragerlei

Copy link
Copy Markdown
Contributor

@QuLogic https://github.com/QuLogic This is fine, thank you!

On 18 September 2016 at 06:20, Elliott Sales de Andrade <
notifications@github.com> wrote:

I'm pulling this back as far as possible to keep everything in sync; there
may be some conflicts when propagating branches forward, but this version
is intended to supersede all copies.

For those of you wondering why you are being tagged here, the .mailmap
file ensures that you will be counted as a single person as part of matplotlib's
GitHub stats http://matplotlib.org/users/github_stats.html. Please
confirm that your name and email (the first entry on a line) are the way
you want to be listed. As there are some layout changes to this file in
this PR, you may want to check only the last commit which only contains the
addition of your names.


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

#7127
Commit Summary

  • Backport .mailmap changes from master.
  • Split names in .mailmap for easier viewing.
  • Add some new entries to .mailmap.

File Changes

Patch Links:

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#7127, or mute the thread
https://github.com/notifications/unsubscribe-auth/AP4Nn12SR_y6nTzRdPwcKxznpHy7k1Pcks5qrMoDgaJpZM4J_zdC
.

@DanHickstein

Copy link
Copy Markdown
Contributor

My name could be listed as "Dan Hickstein" rather than just DanHickstein. Thanks!

Comment thread .mailmap
Patrick Chen <pat.chen@mail.utoronto.ca>

Paul Hobson <pmhobson@gmail.com>
Paul Hobson <pmhobson@gmail.com> vagrant <vagrant@precise32.(none)>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what the vagrant part is. Did I push a commit from a VM along time ago?

Otherwise, this looks good to me.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, #2768. It is a rather generic name though, so we'd have to be careful no-one else uses it, or maybe not bother fixing that one commit's attribution.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oof. Sorry about that.

I'm ok with that commit not getting attributed to me.

The main thing I'm concerned about is that y'all (the core team) have as few headaches as possible. I'm on board with whatever you chose to do wit this.

Comment thread .mailmap Outdated
MinRK <benjaminrk@gmail.com> Min RK <minrk@kerbin.local>
Nelle Varoquaux <nelle.varoquaux@gmail.com> Varoquaux <nelle.varoquaux@gmail.com>

Moritz Beyreuther <random.seed@web.de>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @QuLogic, funny to meet you again in this project :) (and not in obspy). If you do not mind, I would prefer the pseudonym mbyt as name instead.. I do it like this everywhere on github... Email is right.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, no problem. You've still got your name in ObsPy commits, but I realize now those're pretty old and all the new ones are this style.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, advanced thanks!

@tacaswell tacaswell added this to the 2.0.1 (next bug fix release) milestone Sep 18, 2016
Comment thread .mailmap Outdated
Eric Ma <ericmajinglong@gmail.com> <ericmjl@Erics-MacBook-Pro.local>
Eric Ma <ericmajinglong@gmail.com> <ericmjl@users.noreply.github.com>

Filipe <ocefpaf@gmail.com>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filipe Fernandes ocefpaf@gmail.com

(Thanks for doing this @QuLogic.)

@bcongdon

Copy link
Copy Markdown
Contributor

@QuLogic My entry's good. Thanks!

Comment thread .mailmap

matthias <maluethi@protonmail.ch>
matthias <maluethi@protonmail.ch> <matthias.luethi@lhep.unibe.ch>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread .mailmap Outdated

Levi Kilcher <levi.kilcher@nrel.gov>

Lion Krischer <krischer@geophysik.uni-muenchen.de>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread .mailmap Outdated

J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>

Jack Kelly <jack-list@xlk.org.uk> Jack (aka Daniel) Kelly <daniel.kelly10@imperial.ac.uk>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could we change my line to:

Jack Kelly <jack.kelly@imperial.ac.uk>

Thank you!

Comment thread .mailmap
Hans Moritz Günther <moritz.guenther@gmx.de>

J. Goutin <JGoutin@users.noreply.github.com> JGoutin <ginnungagap@free.fr>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, could you change my line to:
J.Goutin JGoutin@users.noreply.github.com
Thanks

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without the space?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the space.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand what you want different then?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just want removing the second mail address.

Thanks.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can leave it out if you don't want them associated, but note the second address already appears in commits alongside your username; this line ensures they're treated as the same person.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is OK for me. Thanks.

@hamogu

hamogu commented Sep 21, 2016

Copy link
Copy Markdown
Contributor

Looks good to me.

@tacaswell

Copy link
Copy Markdown
Member

@QuLogic Feel free to self-merge this.

@QuLogic

QuLogic commented Sep 25, 2016 •

Copy link
Copy Markdown
Member Author

Updated with corrections from @DanHickstein, @ocefpaf, @JackKelly, @krischer, @maluethi, @mbyt, and @rasbt. Note that GitHub no longer hides outdated diffs on their new review comments, so be sure to check the final entry.

Added @LindyBalboa and @TrishGillett from gitter.

@TrishGillett

Copy link
Copy Markdown
Contributor

Mine looks good, thanks!

@LindyBalboa

Copy link
Copy Markdown
Contributor

Alright I'm gonna be a jerk and change my mind. After panning through and seeing that most go with the name (and Travis needing restarted anyways), I'll bite.

Conner R. Phillips

will work. Keep it simple and match the email I suppose. Thanks Elliott.

@basharovV

Copy link
Copy Markdown
Contributor

@QuLogic Please could mine be listed as: Slav Basharov
Email is fine. Thanks!

@mercurynomercy

Copy link
Copy Markdown
Contributor

@QuLogic mine is good to go, thank you

@QuLogic

QuLogic commented Sep 29, 2016

Copy link
Copy Markdown
Member Author

At the end of the month, I think I will merge this. We're at >80% response and many of the remaining haven't even been on GitHub in a while (publicly, at least.)

@flothesof

Copy link
Copy Markdown
Contributor

Could my name be listed as Florian Le Bourdais?
Thanks a lot @QuLogic !

Regards,
Florian

@QuLogic

QuLogic commented Oct 1, 2016

Copy link
Copy Markdown
Member Author

Hopefully last update with corrections from @LindyBalboa, @basharovV, and @flothesof.

@devashishd12

Copy link
Copy Markdown
Contributor

@QuLogic mine is also fine. Thanks!

@mbyt

mbyt commented Oct 2, 2016 •

Copy link
Copy Markdown
Contributor

@QuLogic, thanks for all your work regarding the mailmap updates.

I am unsure if I understand that here correctly. From our conversation above I assumed the .mailmap entry would be mbyt <random.seed@web.de>.

Now, for me it looks like in 0837260 the entry was deleted completely from the list. Am I missing something?

@QuLogic

QuLogic commented Oct 2, 2016

Copy link
Copy Markdown
Member Author

@mbyt Your commits are all correct; there's not really any need for your entry here.

@QuLogic
QuLogic merged commit c2cecfb into matplotlib:v1.5.3-doc Oct 2, 2016
@QuLogic
QuLogic deleted the mailmap-updates branch October 2, 2016 23:10
@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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.