aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorLars Schneider <lars.schneider@autodesk.com>2016-03-01 11:49:56 +0100
committerJunio C Hamano <gitster@pobox.com>2016-03-15 11:45:13 -0700
commit10d08a149d2295a239ac7710d32c0b77492f61c3 (patch)
tree5901bdc77a12cfa7dbf09c76299cc77555e42b65 /Documentation/git-p4.txt
parent594730e980521310d88006d91f3f14ef5eff1e2b (diff)
downloadgit-10d08a149d2295a239ac7710d32c0b77492f61c3.tar.gz
git-p4: map a P4 user to Git author name and email address
Map a P4 user to a specific name and email address in Git with the "git-p4.mapUser" config. The config value must be a string adhering to the format "p4user = First Lastname <email@address.com>". Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-p4.txt')
-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 738cfde10c..9f077fd6f4 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -553,6 +553,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::