aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-14 12:41:38 -0800
committerJunio C Hamano <gitster@pobox.com>2015-01-14 12:41:38 -0800
commit670f6a72b83c0164f303af937df8098d623c4046 (patch)
tree41210d0b0b79a33fa143219eaf5c7ca9e211c68e /Documentation/config.txt
parent401a317aae36fd979da9eafbdd9415fa5ac6e119 (diff)
parent92be938e96508a87fa2b0b78bd335fc6273f5763 (diff)
downloadgit-670f6a72b83c0164f303af937df8098d623c4046.tar.gz
git-670f6a72b83c0164f303af937df8098d623c4046.tar.xz
Merge branch 'po/doc-core-ignorestat'
* po/doc-core-ignorestat: doc: core.ignoreStat update, and clarify the --assume-unchanged effect doc: core.ignoreStat clarify the --assume-unchanged effect
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt21
1 files changed, 13 insertions, 8 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cc887b127..04e2a7168 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -375,14 +375,19 @@ This is useful for excluding servers inside a firewall from
proxy use, while defaulting to a common proxy for external domains.
core.ignoreStat::
- If true, commands which modify both the working tree and the index
- will mark the updated paths with the "assume unchanged" bit in the
- index. These marked files are then assumed to stay unchanged in the
- working tree, until you mark them otherwise manually - Git will not
- detect the file changes by lstat() calls. This is useful on systems
- where those are very slow, such as Microsoft Windows.
- See linkgit:git-update-index[1].
- False by default.
+ If true, Git will avoid using lstat() calls to detect if files have
+ changed by setting the "assume-unchanged" bit for those tracked files
+ which it has updated identically in both the index and working tree.
++
+When files are modified outside of Git, the user will need to stage
+the modified files explicitly (e.g. see 'Examples' section in
+linkgit:git-update-index[1]).
+Git will not normally detect changes to those files.
++
+This is useful on systems where lstat() calls are very slow, such as
+CIFS/Microsoft Windows.
++
+False by default.
core.preferSymlinkRefs::
Instead of the default "symref" format for HEAD