From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:55 +0000 (+0900)
Subject: Merge branch 'js/mailmap'
X-Git-Tag: v2.20.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d90463e8cb03e4d13cb6605b7c971c652c287ee;p=thirdparty%2Fgit.git

Merge branch 'js/mailmap'

Update the mailmap to unify multiple entries for the authors with
commits since v2.10.

* js/mailmap:
  Update .mailmap
---

5d90463e8cb03e4d13cb6605b7c971c652c287ee