aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-01-13 21:49:38 -0500
committerJunio C Hamano <gitster@pobox.com>2020-01-27 10:32:11 -0800
commita0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1 (patch)
tree559ecece956125e5932c6398c0077da9fc46c6c9
parentSync with maint (diff)
downloadgit-a0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1.tar.xz
git-a0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1.zip
.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>
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 7c9441837a1..fbef813f24f 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>