aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-17 11:42:28 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-17 11:42:28 -0800
commit58f1d950e373afe35ed8661045914d23e973d067 (patch)
tree5cc72572de28cfd1f2e9e6d0b1f6299998f15725 /Documentation/config.txt
parent7fa1365c54c28b3cd9375539f381b54061a1880d (diff)
parent9a8c2b67cd5a51666f2c0ce3fbbdb08b97b79b3d (diff)
downloadgit-58f1d950e373afe35ed8661045914d23e973d067.tar.gz
git-58f1d950e373afe35ed8661045914d23e973d067.tar.xz
Sync with v2.0.5
* maint-2.0: Git 2.0.5 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.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6ae4d9070..0a4d22aaf 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