diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-07 13:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-07 13:38:19 -0700 |
| commit | 98f9556a442647db60dad9c7a754832c16af9e73 (patch) | |
| tree | b427b3625d48b1ffa3cd1bedb7d399c9db5043eb /Documentation | |
| parent | Merge branch 'gb/filter-branch-progress' (diff) | |
| parent | git-p4: use replacement character for non UTF-8 characters in paths (diff) | |
| download | tgif-98f9556a442647db60dad9c7a754832c16af9e73.tar.xz | |
Merge branch 'ls/p4-path-encoding'
"git p4" learned to reencode the pathname it uses to communicate
with the p4 depot with a new option.
* ls/p4-path-encoding:
git-p4: use replacement character for non UTF-8 characters in paths
git-p4: improve path encoding verbose output
git-p4: add config git-p4.pathEncoding
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-p4.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 82aa5d6073..12a57d49f4 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -510,6 +510,13 @@ git-p4.useClientSpec:: option '--use-client-spec'. See the "CLIENT SPEC" section above. This variable is a boolean, not the name of a p4 client. +git-p4.pathEncoding:: + Perforce keeps the encoding of a path as given by the originating OS. + 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. + Submit variables ~~~~~~~~~~~~~~~~ git-p4.detectRenames:: |