doc/pretty-formats: describe index/time formats for %gd

diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 738cfde10c84b606e2d341fc2ff597403d1b987b..9d4f1519e789c12b16fe807f6021015bfd68385e 100644 (file)
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -134,7 +134,7 @@ Submit
 ~~~~~~
 Submitting changes from a Git repository back to the p4 repository
 requires a separate p4 client workspace.  This should be specified
-using the 'P4CLIENT' environment variable or the Git configuration
+using the `P4CLIENT` environment variable or the Git configuration
 variable 'git-p4.client'.  The p4 client must exist, but the client root
 will be created and populated if it does not already exist.
 
@@ -166,7 +166,7 @@ General options
 All commands except clone accept these options.
 
 --git-dir <dir>::
-       Set the 'GIT_DIR' environment variable.  See linkgit:git[1].
+       Set the `GIT_DIR` environment variable.  See linkgit:git[1].
 
 -v::
 --verbose::
@@ -515,20 +515,18 @@ git-p4.pathEncoding::
        Git expects paths encoded as UTF-8. Use this config to tell git-p4
        what encoding Perforce had used for the paths. This encoding is used
        to transcode the paths to UTF-8. As an example, Perforce on Windows
-       often uses “cp1252” to encode path names.
+       often uses "cp1252" to encode path names.
 
 git-p4.largeFileSystem::
        Specify the system that is used for large (binary) files. Please note
        that large file systems do not support the 'git p4 submit' command.
-       Only Git LFS [1] is implemented right now. Download
-       and install the Git LFS command line extension to use this option
-       and configure it like this:
+       Only Git LFS is implemented right now (see https://git-lfs.github.com/
+       for more information). Download and install the Git LFS command line
+       extension to use this option and configure it like this:
 +
 -------------
 git config       git-p4.largeFileSystem GitLFS
 -------------
-+
-       [1] https://git-lfs.github.com/
 
 git-p4.largeFileExtensions::
        All files matching a file extension in the list will be processed
@@ -553,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::