path: root/Documentation/git-update-index.txt
diff options
Diffstat (limited to 'Documentation/git-update-index.txt')
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index a10f355..8d88018 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -100,6 +100,10 @@ in the index e.g. when merging in a commit;
thus, in case the assumed-untracked file is changed upstream,
you will need to handle the situation manually.
+ Like '--refresh', but checks stat information unconditionally,
+ without regard to the "assume unchanged" setting.
When one of these flags is specified, the object name recorded
@@ -337,7 +341,7 @@ Configuration
The command honors `core.filemode` configuration variable. If
-your repository is on an filesystem whose executable bits are
+your repository is on a filesystem whose executable bits are
unreliable, this should be set to 'false' (see linkgit:git-config[1]).
This causes the command to ignore differences in file modes recorded
in the index and the file mode on the filesystem if they differ only on