summaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorChris Shoemaker <c.shoemaker@cox.net>2005-10-29 17:46:41 -0400
committerJunio C Hamano <junkio@cox.net>2005-10-30 17:28:01 -0800
commit14470c0de3d5a4388960f59ea96038206bacd888 (patch)
tree4e279cc60fc1a7e0cf1de82eb33b34bb47f27df1 /Documentation/git-update-index.txt
parentb0bafe0364860ba45b74a5aec5b920213d5caa34 (diff)
downloadgit-14470c0de3d5a4388960f59ea96038206bacd888.tar.gz
Add to documentation of git-update-index arguments and usage.
Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <c.shoemaker@cox.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-update-index.txt')
-rw-r--r--Documentation/git-update-index.txt31
1 files changed, 24 insertions, 7 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 8b50efa4e6..58b9e49af5 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -9,15 +9,13 @@ git-update-index - Modifies the index or directory cache
SYNOPSIS
--------
'git-update-index'
- [--add] [--remove] [--unmerged] [--refresh] [--replace]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh [-q] [--unmerged] [--ignore-missing]]
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
- [--info-only]
- [--force-remove]
- [--stdin]
- [--index-info]
- [--ignore-missing]
- [-z]
+ [--info-only] [--index-info]
+ [-z] [--stdin]
+ [--verbose]
[--] [<file>]\*
DESCRIPTION
@@ -45,12 +43,28 @@ OPTIONS
Looks at the current cache and checks to see if merges or
updates are needed by checking stat() information.
+-q::
+ Quiet. If --refresh finds that the cache needs an update, the
+ default behavior is to error out. This option makes
+ git-update-index continue anyway.
+
+--unmerged::
+ If --refresh finds unmerged changes in the cache, the default
+ behavior is to error out. This option makes git-update-index
+ continue anyway.
+
--ignore-missing::
Ignores missing files during a --refresh
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the cache.
+--index-info::
+ Read index info from stdin.
+
+--chmod=(+|-)x::
+ Set the execute permissions on the updated files.
+
--info-only::
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert
@@ -73,6 +87,9 @@ OPTIONS
read list of paths from the standard input. Paths are
separated by LF (i.e. one path per line) by default.
+--verbose::
+ Report what is being added and removed from index.
+
-z::
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.