Merge branch 'ls/p4-doc-markup'

* ls/p4-doc-markup:
  Documentation: fix git-p4 AsciiDoc formatting
  Documentation: use ASCII quotation marks in git-p4
This commit is contained in:
Junio C Hamano
2016-03-24 12:28:06 -07:00

View File

@@ -515,20 +515,18 @@ git-p4.pathEncoding::
Git expects paths encoded as UTF-8. Use this config to tell git-p4 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 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 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:: git-p4.largeFileSystem::
Specify the system that is used for large (binary) files. Please note Specify the system that is used for large (binary) files. Please note
that large file systems do not support the 'git p4 submit' command. that large file systems do not support the 'git p4 submit' command.
Only Git LFS [1] is implemented right now. Download Only Git LFS is implemented right now (see https://git-lfs.github.com/
and install the Git LFS command line extension to use this option for more information). Download and install the Git LFS command line
and configure it like this: extension to use this option and configure it like this:
+ +
------------- -------------
git config git-p4.largeFileSystem GitLFS git config git-p4.largeFileSystem GitLFS
------------- -------------
+
[1] https://git-lfs.github.com/
git-p4.largeFileExtensions:: git-p4.largeFileExtensions::
All files matching a file extension in the list will be processed All files matching a file extension in the list will be processed