From: Denton Liu <liu.denton@gmail.com>
Date: Tue, 14 Jan 2020 02:49:38 +0000 (-0500)
Subject: .mailmap: fix erroneous authorship for Johannes Schindelin
X-Git-Tag: v2.25.1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1;p=thirdparty%2Fgit.git

.mailmap: fix erroneous authorship for Johannes Schindelin

In 49e268e23e (mingw: safeguard better against backslashes in file
names, 2020-01-09), the commit author is listed as
"Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>", which
is erroneous. Fix the authorship by mapping the erroneous authorship to
his canonical authorship information.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/.mailmap b/.mailmap
index 7c9441837a..fbef813f24 100644
--- 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>