diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-05-29 00:20:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 00:20:04 +0200 |
| commit | 2d01c91c3076f1eb31e5792cd2e67d66f8423f4c (patch) | |
| tree | 738d69d459ee1b87a22078354376bb07459e2618 /src/test/ui/thinlto | |
| parent | 21684c07c7f0b83601dfb834bc717cd411a94004 (diff) | |
| parent | b0c3385a6348d8ed3ed71d95b643c9ec041cc5e3 (diff) | |
| download | rust-2d01c91c3076f1eb31e5792cd2e67d66f8423f4c.tar.gz rust-2d01c91c3076f1eb31e5792cd2e67d66f8423f4c.zip | |
Rollup merge of #61259 - JosephTLyons:mailmap-fixes, r=nikomatsakis
Mailmap fixes I've made a few fixes and additions to the .mailmap file. - I've added my information to it, as I noticed it was popping up twice at the [Thanks](https://thanks.rust-lang.org/rust/all-time/) website (I've made contributions to the Rust Book). - I noticed that @carols10cents‘ information was popping up in multiple places at the [Thanks](https://thanks.rust-lang.org/rust/all-time/) website and when running `git shortlog -s -e > out.txt`, and fixed her information - I alphabetized the list using Atom's [Sort Lines package](https://github.com/atom/sort-lines) The output from before and after running `git shortlog -s -e > out.txt` for Carol: <img width="708" alt="Carol Before" src="https://user-images.githubusercontent.com/19867440/58472843-2d8ca880-8115-11e9-9624-d31ed23ae9b5.png"> <img width="523" alt="Carol After" src="https://user-images.githubusercontent.com/19867440/58472844-2d8ca880-8115-11e9-95c6-80b17cc04790.png"> The output from before and after running `git shortlog -s -e > out.txt` for myself: <img width="489" alt="Joseph After" src="https://user-images.githubusercontent.com/19867440/58472941-6e84bd00-8115-11e9-8266-1d7fcd53d0bc.png"> <img width="421" alt="Joseph Before" src="https://user-images.githubusercontent.com/19867440/58472943-6e84bd00-8115-11e9-9fd2-d7ace7e3d636.png">
Diffstat (limited to 'src/test/ui/thinlto')
0 files changed, 0 insertions, 0 deletions