Sync with maint

gitster · gitster · commit c7a62075917b · 2020-01-27T13:26:07.000-08:00
* maint:
  .mailmap: fix erroneous authorship for Johannes Schindelin
diff --git a/.mailmap b/.mailmap
@@ -109,6 +109,7 @@ Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>

-Original file line number
+Diff line change
 Joachim Berdal Haga <[email protected]>
 Joachim Jablon <[email protected]> <[email protected]>
 Johannes Schindelin <[email protected]> <[email protected]>
 +Johannes Schindelin <[email protected]> Johannes Schindelin via GitGitGadget <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>