Merge branch 'am/mailmap-andrey-mazo'

gitster · gitster · commit 847650798bbd · 2019-10-06T12:25:15.000+09:00
* am/mailmap-andrey-mazo:
  .mailmap: update email address of Andrey Mazo
diff --git a/.mailmap b/.mailmap
@@ -18,6 +18,7 @@ Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
 Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
 Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
+Andrey Mazo <ahippo@yandex.com> Mazo, Andrey <amazo@checkvideo.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
 Amos Waterland <apw@debian.org> <apw@us.ibm.com>

-Original file line number
+Diff line change
 Alexey Shumkin <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 Anders Kaseorg <[email protected]> <[email protected]>
 +Andrey Mazo <[email protected]> Mazo, Andrey <[email protected]>
 Aneesh Kumar K.V <[email protected]>
 Amos Waterland <[email protected]> <[email protected]>
 Amos Waterland <[email protected]> <[email protected]>