]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jan 2020 22:17:17 +0000 (14:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jan 2020 22:17:17 +0000 (14:17 -0800)
* maint:
  .mailmap: map Yi-Jyun Pan's email

1  2 
.mailmap

diff --cc .mailmap
Simple merge