Merge branch 'ls/p4-map-user'
commit1d851b9d30f5a7d2efdda71623839dcabd27577e
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:05 +0000 (6 11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:05 +0000 (6 11:39 -0700)
tree5ca1df24ff4f7978cf920a273af8b9313133c290
parent5e533f8ffd12cdc2d20283c3900fc3561d449b82
parent10d08a149d2295a239ac7710d32c0b77492f61c3
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
Documentation/git-p4.txt
git-p4.py