summaryrefslogtreecommitdiffstats
path: root/git-p4.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 15:58:21 -0700
committerJunio C Hamano <gitster@pobox.com>2016-04-06 15:58:21 -0700
commitbec5da4921ecdf10f30acd425332ad4c40801c8b (patch)
tree9dd5d7a62bf70c503bf8ce1136df706920e42583 /git-p4.txt
parent4ba4a78f046a4424d303350cbbbf47b04b728b11 (diff)
downloadgit-htmldocs-bec5da4921ecdf10f30acd425332ad4c40801c8b.tar.gz
Autogenerated HTML docs for v2.8.1-101-g72d91
Diffstat (limited to 'git-p4.txt')
-rw-r--r--git-p4.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/git-p4.txt b/git-p4.txt
index 35e317091..88ba42b45 100644
--- a/git-p4.txt
+++ b/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::