aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 11:39:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-06 11:39:05 -0700
commit1d851b9d30f5a7d2efdda71623839dcabd27577e (patch)
tree5ca1df24ff4f7978cf920a273af8b9313133c290 /Documentation
parent5e533f8ffd12cdc2d20283c3900fc3561d449b82 (diff)
parent10d08a149d2295a239ac7710d32c0b77492f61c3 (diff)
downloadgit-1d851b9d30f5a7d2efdda71623839dcabd27577e.tar.gz
git-1d851b9d30f5a7d2efdda71623839dcabd27577e.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 35e317091..88ba42b45 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -551,6 +551,17 @@ git-p4.keepEmptyCommits::
A changelist that contains only excluded files will be imported
as an empty commit if this boolean option is set to true.
+git-p4.mapUser::
+ Map a P4 user to a name and email address in Git. Use a string
+ with the following format to create a mapping:
++
+-------------
+git config --add git-p4.mapUser "p4user = First Last <mail@address.com>"
+-------------
++
+A mapping will override any user information from P4. Mappings for
+multiple P4 user can be defined.
+
Submit variables
~~~~~~~~~~~~~~~~
git-p4.detectRenames::