aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-27 13:26:07 -0800
committerJunio C Hamano <gitster@pobox.com>2020-01-27 13:26:07 -0800
commitc7a62075917b3340f908093f63f1161c44ed1475 (patch)
treef8fa7543afb10d56e2138e2a7313aa8c2c93f3ba
parentThe first batch post 2.25 cycle (diff)
parent.mailmap: fix erroneous authorship for Johannes Schindelin (diff)
downloadgit-c7a62075917b3340f908093f63f1161c44ed1475.tar.xz
git-c7a62075917b3340f908093f63f1161c44ed1475.zip
Sync with maint
* maint: .mailmap: fix erroneous authorship for Johannes Schindelin
-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>