summaryrefslogtreecommitdiffstats
path: root/git-p4.html
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.html
parent4ba4a78f046a4424d303350cbbbf47b04b728b11 (diff)
downloadgit-htmldocs-bec5da4921ecdf10f30acd425332ad4c40801c8b.tar.gz
Autogenerated HTML docs for v2.8.1-101-g72d91
Diffstat (limited to 'git-p4.html')
-rw-r--r--git-p4.html17
1 files changed, 16 insertions, 1 deletions
diff --git a/git-p4.html b/git-p4.html
index 50e3d7e37..737e972f2 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -1574,6 +1574,21 @@ git-p4.keepEmptyCommits
as an empty commit if this boolean option is set to true.
</p>
</dd>
+<dt class="hdlist1">
+git-p4.mapUser
+</dt>
+<dd>
+<p>
+ Map a P4 user to a name and email address in Git. Use a string
+ with the following format to create a mapping:
+</p>
+<div class="listingblock">
+<div class="content">
+<pre><code>git config --add git-p4.mapUser "p4user = First Last &lt;mail@address.com&gt;"</code></pre>
+</div></div>
+<div class="paragraph"><p>A mapping will override any user information from P4. Mappings for
+multiple P4 user can be defined.</p></div>
+</dd>
</dl></div>
</div>
<div class="sect2">
@@ -1744,7 +1759,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-03-24 15:16:24 PDT
+Last updated 2016-04-06 15:57:48 PDT
</div>
</div>
</body>