summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-01-14 03:23:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 18:23:45 (GMT)
commit0ad714499976290d9a0229230cbe4efae930b8dc (patch)
treec53fe708465ef5fa5f1640721a2fc362902090a3 /.mailmap
parenta0ba80001a42eeacae94e3503c3e7d4bf7f2f2e1 (diff)
downloadgit-0ad714499976290d9a0229230cbe4efae930b8dc.zip
git-0ad714499976290d9a0229230cbe4efae930b8dc.tar.gz
git-0ad714499976290d9a0229230cbe4efae930b8dc.tar.bz2
.mailmap: map Yi-Jyun Pan's email
In 13185fd241 (l10n: zh_TW.po: update translation for v2.25.0 round 1, 2019-12-31), the author mistakenly used their GitHub username for authorship information instead of their real name. However, a commit with their real name exists prior to this: 9917eca794 (l10n: zh_TW: add translation for v2.24.0, 2019-11-20). Map their email to their real name so that these contributions can be counted together. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index fbef813..0f20882 100644
--- a/.mailmap
+++ b/.mailmap
@@ -288,6 +288,7 @@ William Pursell <bill.pursell@gmail.com>
YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+Yi-Jyun Pan <pan93412@gmail.com>
# the two anonymous contributors are different persons:
anonymous <linux@horizon.com>
anonymous <linux@horizon.net>