Sync with maint

gitster · gitster · commit 5b0ca878e008 · 2020-01-30T14:17:17.000-08:00
* maint:
  .mailmap: map Yi-Jyun Pan's email
diff --git a/.mailmap b/.mailmap
@@ -289,6 +289,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>

-Original file line number
+Diff line change
 YONETANI Tomokazu <[email protected]> <[email protected]>
 YONETANI Tomokazu <[email protected]> <[email protected]>
 YOSHIFUJI Hideaki <[email protected]>
 +Yi-Jyun Pan <[email protected]>
 # the two anonymous contributors are different persons:
 anonymous <[email protected]>
 anonymous <[email protected]>