summaryrefslogtreecommitdiff
path: root/merge-recursive.c
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 /merge-recursive.c
parent232378479ee6c66206d47a9be175e3a39682aea6 (diff)
downloadgit-a0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1.tar.gz
.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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions