diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-05-03 18:34:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 18:34:01 -0400 |
| commit | e2cedb249f00460247c015c9470b0a3e6d4fca85 (patch) | |
| tree | 86ba0ff9f328d8ea4402d84f2dc5559186d2ce32 | |
| parent | 10fde3393be6295c8df2ce6c016f3f37b25b58b7 (diff) | |
| parent | b1ab145ec265aaa9b6cc9978ae1ef222cdf9e018 (diff) | |
| download | rust-e2cedb249f00460247c015c9470b0a3e6d4fca85.tar.gz rust-e2cedb249f00460247c015c9470b0a3e6d4fca85.zip | |
Rollup merge of #41715 - martinhath:master, r=aturon
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.
| -rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap index 4b4f343d15a..ee5b6f257b5 100644 --- a/.mailmap +++ b/.mailmap @@ -139,6 +139,7 @@ Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew> Mark Sinclair <mark.edward.x@gmail.com> Mark Sinclair <mark.edward.x@gmail.com> =Mark Sinclair <=125axel125@gmail.com> Markus Westerlind <marwes91@gmail.com> Markus <marwes91@gmail.com> +Martin Hafskjold Thoresen <martinhath@gmail.com> Matej Lach <matej.lach@gmail.com> Matej Ľach <matej.lach@gmail.com> Matt Brubeck <mbrubeck@limpet.net> <mbrubeck@cs.hmc.edu> Matthew Auld <matthew.auld@intel.com> |