Rollup merge of rust-lang#67633 - christianpoveda:patch-1, r=Mark-Simulacrum

Mark-Simulacrum · web-flow · commit 6a827fb906b1 · 2019-12-26T17:27:25.000-05:00
Update .mailmap
diff --git a/.mailmap b/.mailmap
@@ -54,9 +54,10 @@ Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccer
 Chris Pressey <cpressey@gmail.com>
 Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
 Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vittal@gmail.com>
-Christian Poveda <christianpoveda@protonmail.com> <cn.poveda.ruiz@gmail.com>
-Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com>
-Christian Poveda <christianpoveda@protonmail.com> <cpovedar@fnal.gov>
+Christian Poveda <git@christianpoveda.xyz> <christianpoveda@protonmail.com>
+Christian Poveda <git@christianpoveda.xyz> <cn.poveda.ruiz@gmail.com>
+Christian Poveda <git@christianpoveda.xyz> <z1mvader@protonmail.com>
+Christian Poveda <git@christianpoveda.xyz> <cpovedar@fnal.gov>
 Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
 Clinton Ryan <clint.ryan3@gmail.com>
 Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>

-Original file line number
+Diff line change
 Chris Pressey <[email protected]>
 Chris Thorn <[email protected]> Chris Thorn <[email protected]>
 Chris Vittal <[email protected]> Christopher Vittal <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 -Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 +Christian Poveda <[email protected]> <[email protected]>
 Clark Gaebel <[email protected]> <[email protected]>
 Clinton Ryan <[email protected]>
 Corey Richardson <[email protected]> Elaine "See More" Nemo <[email protected]>