aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-29 14:32:56 -0700
committerJunio C Hamano <junkio@cox.net>2005-10-29 14:32:56 -0700
commit5773c9f2b28c3af92b7e9c6832536e99ab11cc78 (patch)
treeb53f05d77b2fe537e27c06205764dcf8bee70301 /Documentation/git-update-index.txt
parent52e4478dbd3425332ed4ef6a4cadeb034ee8c4b6 (diff)
downloadgit-5773c9f2b28c3af92b7e9c6832536e99ab11cc78.tar.gz
git-5773c9f2b28c3af92b7e9c6832536e99ab11cc78.tar.xz
Documentation updates.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-update-index.txt')
-rw-r--r--Documentation/git-update-index.txt24
1 files changed, 19 insertions, 5 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 6fa1d980f..8b50efa4e 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -9,12 +9,15 @@ git-update-index - Modifies the index or directory cache
SYNOPSIS
--------
'git-update-index'
- [--add] [--remove] [--refresh] [--replace]
- [--ignore-missing]
- [--force-remove]
+ [--add] [--remove] [--unmerged] [--refresh] [--replace]
[--cacheinfo <mode> <object> <file>]\*
+ [--chmod=(+|-)x]
[--info-only]
- [-z] [--stdin]
+ [--force-remove]
+ [--stdin]
+ [--index-info]
+ [--ignore-missing]
+ [-z]
[--] [<file>]\*
DESCRIPTION
@@ -79,7 +82,7 @@ OPTIONS
<file>::
Files to act on.
- Note that files begining with '.' are discarded. This includes
+ Note that files beginning with '.' are discarded. This includes
`./file` and `dir/./file`. If you don't want this, then use
cleaner names.
The same applies to directories ending '/' and paths with '//'
@@ -121,6 +124,17 @@ To update and refresh only the files already checked out:
git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh
+Configuration
+-------------
+
+The command honors `core.filemode` configuration variable. If
+your repository is on an filesystem whose executable bits are
+unreliable, this should be set to 'false'. 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
+executable bit. On such an unfortunate filesystem, you may
+need to use `git-update-index --chmod=`.
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org>