summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 14:57:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 14:57:57 -0700
commit7fc311d5ff6ac979aec6670bb2dc6bfc6ba9f0df (patch)
treefbf6c49256ae99100d619549dc1c1e0cef7ae385
parentMerge branch 'rs/run-command-env-array' (diff)
parentcore.filemode may need manual action (diff)
downloadtgif-7fc311d5ff6ac979aec6670bb2dc6bfc6ba9f0df.tar.xz
Merge branch 'tb/core-filemode-doc'
Doc update. * tb/core-filemode-doc: core.filemode may need manual action
-rw-r--r--Documentation/config.txt25
1 files changed, 19 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 400dcad21d..8b49813d80 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -204,13 +204,26 @@ advice.*::
--
core.fileMode::
- If false, the executable bit differences between the index and
- the working tree are ignored; useful on broken filesystems like FAT.
- See linkgit:git-update-index[1].
+ Tells Git if the executable bit of files in the working tree
+ is to be honored.
+
-The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
-will probe and set core.fileMode false if appropriate when the
-repository is created.
+Some filesystems lose the executable bit when a file that is
+marked as executable is checked out, or checks out an
+non-executable file with executable bit on.
+linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem
+to see if it handles the executable bit correctly
+and this variable is automatically set as necessary.
++
+A repository, however, may be on a filesystem that handles
+the filemode correctly, and this variable is set to 'true'
+when created, but later may be made accessible from another
+environment that loses the filemode (e.g. exporting ext4 via
+CIFS mount, visiting a Cygwin created repository with
+Git for Windows or Eclipse).
+In such a case it may be necessary to set this variable to 'false'.
+See linkgit:git-update-index[1].
++
+The default is true (when core.filemode is not specified in the config file).
core.ignorecase::
If true, this option enables various workarounds to enable