diff options
authorChris Shoemaker <>2005-10-29 21:46:41 (GMT)
committerJunio C Hamano <>2005-10-31 01:28:01 (GMT)
commit14470c0de3d5a4388960f59ea96038206bacd888 (patch)
parentb0bafe0364860ba45b74a5aec5b920213d5caa34 (diff)
Add to documentation of git-update-index arguments and usage.
Removed unknown [--version] option. Signed-off-by: Chris Shoemaker <> Signed-off-by: Junio C Hamano <>
2 files changed, 25 insertions, 8 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 8b50efa..58b9e49 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
- [--add] [--remove] [--unmerged] [--refresh] [--replace]
+ [--add] [--remove | --force-remove] [--replace]
+ [--refresh [-q] [--unmerged] [--ignore-missing]]
[--cacheinfo <mode> <object> <file>]\*
- [--info-only]
- [--force-remove]
- [--stdin]
- [--index-info]
- [--ignore-missing]
- [-z]
+ [--info-only] [--index-info]
+ [-z] [--stdin]
+ [--verbose]
[--] [<file>]\*
@@ -45,12 +43,28 @@ OPTIONS
Looks at the current cache and checks to see if merges or
updates are needed by checking stat() information.
+ 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.
+ If --refresh finds unmerged changes in the cache, the default
+ behavior is to error out. This option makes git-update-index
+ continue anyway.
Ignores missing files during a --refresh
--cacheinfo <mode> <object> <path>::
Directly insert the specified info into the cache.
+ Read index info from stdin.
+ Set the execute permissions on the updated files.
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.
+ Report what is being added and removed from index.
Only meaningful with `--stdin`; paths are separated with
NUL character instead of LF.
diff --git a/update-index.c b/update-index.c
index 661b86a..5bbc3de 100644
--- a/update-index.c
+++ b/update-index.c
@@ -393,7 +393,7 @@ static void read_index_info(int line_termination)
static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--version] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
int main(int argc, const char **argv)