From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Apr 2016 18:39:05 +0000 (-0700)
Subject: Merge branch 'ls/p4-map-user'
X-Git-Tag: v2.9.0-rc0~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d851b9d30f5a7d2efdda71623839dcabd27577e;p=thirdparty%2Fgit.git

Merge branch 'ls/p4-map-user'

"git p4" now allows P4 author names to be mapped to Git author
names.

* ls/p4-map-user:
  git-p4: map a P4 user to Git author name and email address
---

1d851b9d30f5a7d2efdda71623839dcabd27577e