summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-24 12:28:06 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-24 12:28:06 -0700
commit56331f8727b0c2e7dc713b728eaf1e5843422cb7 (patch)
treec8c08b1b381faa2855eae9896074af3504c94e40
parent269fe3aed490b24f2b5d2d69ac2cc508e9366ac6 (diff)
parent887523ebb8cedcb2f219a18539b2be98e6a5e7cd (diff)
downloadgit-56331f8727b0c2e7dc713b728eaf1e5843422cb7.tar.gz
Merge branch 'ls/p4-doc-markup'
* ls/p4-doc-markup: Documentation: fix git-p4 AsciiDoc formatting Documentation: use ASCII quotation marks in git-p4
-rw-r--r--Documentation/git-p4.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 738cfde10c..35e3170918 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -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