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>
Chris Shoemaker committed
Oct 29, 2005 at 17:46 UTC
14470c0de3d5a4388960f59ea96038206bacd888
2 files changed
+25
-8
Documentation/git-update-index.txt
+24
-7
@@ -9,15 +9,13 @@ git-update-index - Modifies the index or directory cache
9
SYNOPSIS
10
--------
11
'git-update-index'
12
- [--add] [--remove] [--unmerged] [--refresh] [--replace]
12
+ [--add] [--remove | --force-remove] [--replace]
13
+ [--refresh [-q] [--unmerged] [--ignore-missing]]
14
[--cacheinfo <mode> <object> <file>]\*
15
[--chmod=(+|-)x]
15
- [--info-only]
16
- [--force-remove]
17
- [--stdin]
18
- [--index-info]
19
- [--ignore-missing]
20
- [-z]
16
+ [--info-only] [--index-info]
17
+ [-z] [--stdin]
18
+ [--verbose]
19
[--] [<file>]\*
20
21
DESCRIPTION
@@ -45,12 +43,28 @@ OPTIONS
43
Looks at the current cache and checks to see if merges or
44
updates are needed by checking stat() information.
45
46
+-q::
47
+ Quiet. If --refresh finds that the cache needs an update, the
48
+ default behavior is to error out. This option makes
49
+ git-update-index continue anyway.
50
+
51
+--unmerged::
52
+ If --refresh finds unmerged changes in the cache, the default
53
+ behavior is to error out. This option makes git-update-index
54
+ continue anyway.
55
+
56
--ignore-missing::
57
Ignores missing files during a --refresh
58
59
--cacheinfo <mode> <object> <path>::
60
Directly insert the specified info into the cache.
61
62
+--index-info::
63
+ Read index info from stdin.
64
+
65
+--chmod=(+|-)x::
66
+ Set the execute permissions on the updated files.
67
+
68
--info-only::
69
Do not create objects in the object database for all
70
<file> arguments that follow this flag; just insert
@@ -73,6 +87,9 @@ OPTIONS
87
read list of paths from the standard input. Paths are
88
separated by LF (i.e. one path per line) by default.
89
90
+--verbose::
91
+ Report what is being added and removed from index.
92
+
93
-z::
94
Only meaningful with `--stdin`; paths are separated with
95
NUL character instead of LF.
update-index.c
+1
-1
@@ -393,7 +393,7 @@ static void read_index_info(int line_termination)
393
}
394
395
static const char update_index_usage[] =
396
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--version] [--] <file>...";
396
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
397
398
int main(int argc, const char **argv)
399
{