path: root/Documentation
diff options
authorJunio C Hamano <>2014-12-17 19:11:15 (GMT)
committerJunio C Hamano <>2014-12-17 19:11:15 (GMT)
commit2aa910084681a6cbfb0928b2d9c4d0f9ce54e1b8 (patch)
tree1aeb9ab0f337c278560d7ea72deb21f9c5e45de7 /Documentation
parenteeff891ac756fd97a05476446f15269b714ce4cc (diff)
parentd08c13b947335cc48ecc1a8453d97b7147c2d6d6 (diff)
Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5
* dotgit-case-maint-1.8.5: fsck: complain about NTFS ".git" aliases in trees read-cache: optionally disallow NTFS .git variants path: add is_ntfs_dotgit() helper fsck: complain about HFS+ ".git" aliases in trees read-cache: optionally disallow HFS+ .git variants utf8: add is_hfs_dotgit() helper fsck: notice .git case-insensitively t1450: refactor ".", "..", and ".git" fsck tests verify_dotfile(): reject .git case-insensitively read-tree: add tests for confusing paths like ".." and ".git" unpack-trees: propagate errors adding entries to the index
Diffstat (limited to 'Documentation')
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ab26963..097fdd4 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -234,6 +234,17 @@ core.precomposeunicode::
When false, file names are handled fully transparent by Git,
which is backward compatible with older versions of Git.
+ If set to true, do not allow checkout of paths that would
+ be considered equivalent to `.git` on an HFS+ filesystem.
+ Defaults to `true` on Mac OS, and `false` elsewhere.
+ If set to true, do not allow checkout of paths that would
+ cause problems with the NTFS filesystem, e.g. conflict with
+ 8.3 "short" names.
+ Defaults to `true` on Windows, and `false` elsewhere.
If false, the ctime differences between the index and the
working tree are ignored; useful when the inode change time