diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-18 12:30:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-18 12:30:53 -0800 |
| commit | 3f1509809e728b70ea7912e4e1b40f22965e45ee (patch) | |
| tree | 7ace4e090655502a539d7da3d9d85a2acd23b846 /Documentation/config.txt | |
| parent | 9abc44b681a669c67d071d858c8aad21f65a0956 (diff) | |
| parent | 9b7cbb315923e61bb0c4297c701089f30e116750 (diff) | |
| download | git-3f1509809e728b70ea7912e4e1b40f22965e45ee.tar.gz git-3f1509809e728b70ea7912e4e1b40f22965e45ee.tar.xz | |
Sync with v2.2.1
* maint:
Git 2.2.1
Git 2.1.4
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.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f615a5c35..9335ff2ae 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -246,6 +246,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 |