Rollup merge of #47637 - russmack:fix-mailmap-dupes, r=steveklabnik

GuillaumeGomez · web-flow · commit dcbf0bf5f5f5 · 2018-01-21T23:11:45.000+01:00
Fix mailmap duplicates, Carol and Brian.

This fix corrects the .mailmap file so that Carol (Nichols || Goulding) appears only once, and Brian Anderson also appears only once.
diff --git a/.mailmap b/.mailmap
@@ -41,11 +41,12 @@ Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
 Brandon Sanderson <singingboyo@gmail.com> Brandon Sanderson <singingboyo@hotmail.com>
 Brett Cannon <brett@python.org> Brett Cannon <brettcannon@users.noreply.github.com>
 Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
+Brian Anderson <banderson@mozilla.com> <banderson@mozilla.org>
 Brian Dawn <brian.t.dawn@gmail.com>
 Brian Leibig <brian@brianleibig.com> Brian Leibig <brian.leibig@gmail.com>
 Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
-Carol (Nichols || Goulding) <carol.nichols@gmail.com>
-Carol (Nichols || Goulding) <cnichols@thinkthroughmath.com>
+Carol (Nichols || Goulding) <carol.nichols@gmail.com> <cnichols@thinkthroughmath.com>
+Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
 Carol Willing <carolcode@willingconsulting.com>
 Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccerami@gmail.com>
 Chris Pressey <cpressey@gmail.com>

-Original file line number
+Diff line change
 Brandon Sanderson <[email protected]> Brandon Sanderson <[email protected]>
 Brett Cannon <[email protected]> Brett Cannon <[email protected]>
 Brian Anderson <[email protected]> <[email protected]>
 +Brian Anderson <[email protected]> <[email protected]>
 Brian Dawn <[email protected]>
 Brian Leibig <[email protected]> Brian Leibig <[email protected]>
 Carl-Anton Ingmarsson <[email protected]> <[email protected]>
 -Carol (Nichols || Goulding) <[email protected]>
 -Carol (Nichols || Goulding) <cnichols@thinkthroughmath.com>
 +Carol (Nichols || Goulding) <[email protected]> <[email protected]>
 +Carol (Nichols || Goulding) <[email protected]> Carol Nichols <carol.nichols@gmail.com>
 Carol Willing <[email protected]>
 Chris C Cerami <[email protected]> Chris C Cerami <[email protected]>
 Chris Pressey <[email protected]>