granicus.if.org Git - git/commit

]> granicus.if.org Git - git/commit

author	Junio C Hamano <gitster@pobox.com>
	Wed, 6 Apr 2016 18:39:05 +0000 (11:39 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Wed, 6 Apr 2016 18:39:05 +0000 (11:39 -0700)
commit	1d851b9d30f5a7d2efdda71623839dcabd27577e
tree	5ca1df24ff4f7978cf920a273af8b9313133c290	tree \| snapshot
parent	5e533f8ffd12cdc2d20283c3900fc3561d449b82	commit \| diff
parent	10d08a149d2295a239ac7710d32c0b77492f61c3	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
git-p4.py	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Documentation/git-p4.txt	diff1 \|	diff2 \|	blob \| history
git-p4.py	diff1 \|	diff2 \|	blob \| history