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

Fix @martinhath's mailmap entry #41715

Merged
merged 1 commit into from
May 4, 2017
Merged

Fix @martinhath's mailmap entry #41715

merged 1 commit into from
May 4, 2017

Conversation

martinhath
Copy link
Contributor

I stumbled upon a name duplication issue in rust-lang-nursery/thanks, and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (git shortlog | grep "Thoresen" only returns one entry instead of two).

I didn't bother creating an issue in the thanks repository, since I did the .mailmap editing myself.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @aturon (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@aturon
Copy link
Member

aturon commented May 3, 2017

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented May 3, 2017

📌 Commit b1ab145 has been approved by aturon

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 3, 2017
Fix @martinhath's mailmap entry

I stumbled upon a name duplication issue in [rust-lang-nursery/thanks](https://github.com/rust-lang-nursery/thanks/), and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (`git shortlog | grep "Thoresen"` only returns one entry instead of two).

I didn't bother creating an issue in the `thanks` repository, since I did the `.mailmap` editing myself.
@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 3, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 3, 2017
Fix @martinhath's mailmap entry

I stumbled upon a name duplication issue in [rust-lang-nursery/thanks](https://github.com/rust-lang-nursery/thanks/), and realized that this problem is easily fixable. I've (hopefully) done the right thing here. It works locally (`git shortlog | grep "Thoresen"` only returns one entry instead of two).

I didn't bother creating an issue in the `thanks` repository, since I did the `.mailmap` editing myself.
bors added a commit that referenced this pull request May 3, 2017
Rollup of 6 pull requests

- Successful merges: #41543, #41600, #41715, #41720, #41721, #41730
- Failed merges:
@bors bors merged commit b1ab145 into rust-lang:master May 4, 2017
@bors
Copy link
Contributor

bors commented May 4, 2017

⌛ Testing commit b1ab145 with merge b16c7a2...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants