diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:28:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-17 11:28:54 -0800 |
commit | 5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f (patch) | |
tree | 54e850e494e9bb6d25d99f82aeb03e1f8ec3faff /Documentation/config.txt | |
parent | 76f8611a5fb7e81c1bada0fb190d573a66fc03f6 (diff) | |
parent | 83332636f575f00edff8f3afb15a2f96885bf417 (diff) | |
download | git-5e519fb8b09378342e23bd8c075cfb4b8e7b0e4f.tar.gz |
Sync with v1.9.5
* maint-1.9:
Git 1.9.5
Git 1.8.5.6
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/config.txt')
-rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c08286e968..0c32597639 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -233,6 +233,17 @@ core.precomposeunicode:: When false, file names are handled fully transparent by Git, which is backward compatible with older versions of Git. +core.protectHFS:: + 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. + +core.protectNTFS:: + 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. + core.trustctime:: If false, the ctime differences between the index and the working tree are ignored; useful when the inode change time |