diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-13 22:37:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-13 22:37:51 (GMT) |
| commit | b856ad623e4f686815986c0b9341dd1bfd791e71 (patch) | |
| tree | ddce49b4afdb7428c1cba49628020bd796704661 /Documentation | |
| parent | 6a9aa0c9b224517db0549d9252fdbc5177e6c0e2 (diff) | |
| parent | 76759c7dff53e8c84e975b88cb8245587c14c7ba (diff) | |
| download | git-b856ad623e4f686815986c0b9341dd1bfd791e71.zip git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.gz git-b856ad623e4f686815986c0b9341dd1bfd791e71.tar.bz2 | |
Merge branch 'tb/sanitize-decomposed-utf-8-pathname'
Teaches git to normalize pathnames read from readdir(3) and all
arguments from the command line into precomposed UTF-8 (assuming
that they come as decomposed UTF-8) to work around issues on Mac OS.
I think there still are other places that need conversion
(e.g. paths that are read from stdin for some commands), but this
should be a good first step in the right direction.
* tb/sanitize-decomposed-utf-8-pathname:
git on Mac OS and precomposed unicode
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c6ff15e..7bc0e53 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -211,6 +211,15 @@ The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] will probe and set core.ignorecase true if appropriate when the repository is created. +core.precomposeunicode:: + This option is only used by Mac OS implementation of git. + When core.precomposeunicode=true, git reverts the unicode decomposition + of filenames done by Mac OS. This is useful when sharing a repository + between Mac OS and Linux or Windows. + (Git for Windows 1.7.10 or higher is needed, or git under cygwin 1.7). + When false, file names are handled fully transparent by git, + which is backward compatible with older versions of git. + core.trustctime:: If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time |