git on Mac OS and precomposed unicode

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 915cb5a547896966377e9f39059527e3142b27c8..c92e7b92e91779d6a9c9341ee692a169cd3cfe85 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -210,6 +210,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