Skip to content
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.

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

MAINT: Update .mailmap #8182

Merged
merged 1 commit into from
Nov 5, 2016
Merged

MAINT: Update .mailmap #8182

merged 1 commit into from
Nov 5, 2016

Conversation

charris
Copy link
Member

@charris charris commented Oct 19, 2016

Contributor nevimov did not want his full name used.

[ci skip]

@charris
Copy link
Member Author

charris commented Oct 20, 2016

Let's not merge this just yet, there may be more modifications needed befor the 1.12 branch.

@@ -18,7 +18,6 @@ Alex Griffing <argriffi@ncsu.edu> alex <argriffi@ncsu.edu>
Alex Griffing <argriffi@ncsu.edu> argriffing <argriffi@ncsu.edu>
Copy link
Contributor

Choose a reason for hiding this comment

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

This should probably be removed too.

Copy link
Contributor

@madphysicist madphysicist Oct 21, 2016

Choose a reason for hiding this comment

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

In fact all entries of the form "A <B> A <B>" and "A <B> <B>" should probably be removed.

Copy link
Member Author

Choose a reason for hiding this comment

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

Why? It associates a real name to the nickname.

Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry. I clicked on the wrong line. I am pretty sure I meant Alok Singhal <gandalf013@gmail.com> Alok Singhal <gandalf013@gmail.com> which seems to add no new information.

Copy link
Member Author

@charris charris Oct 21, 2016

Choose a reason for hiding this comment

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

Yep, looks like you are right. Entries of the form "A <B> <B>" are valid though, remaps possible nicknames based on address. Just found some decent .mailmap documentation at https://git-scm.com/docs/git-shortlog.

Copy link
Member Author

Choose a reason for hiding this comment

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

Looks like some others, also. I'm not going to worry about that now but do a cleanup sometime in the future.

Contributor nevimov did not want his full name used.

[ci skip]
@charris charris merged commit 9589a5a into numpy:master Nov 5, 2016
@charris charris deleted the update-mailmap branch November 5, 2016 16:20
This was referenced Nov 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants