X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-update-index.txt;h=0a1953803e48947f6eeae385550ac2cd4e838411;hb=27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279;hp=cd5e014d4899954b204173f6e1d84e011a307ac8;hpb=bff898b894815ad291b35d213f1c022d1d16a9b9;p=git.git diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index cd5e014d4..0a1953803 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -27,6 +27,9 @@ Modifies the index or directory cache. Each file mentioned is updated into the index and any 'unmerged' or 'needs updating' state is cleared. +See also gitlink:git-add[1] for a more user-friendly way to do some of +the most common operations on the index. + The way "git-update-index" handles files it is told about can be modified using the various options: @@ -53,7 +56,7 @@ OPTIONS --unmerged:: If --refresh finds unmerged changes in the index, the default - behavior is to error out. This option makes git-update-index + behavior is to error out. This option makes git-update-index continue anyway. --ignore-missing:: @@ -61,12 +64,12 @@ OPTIONS --cacheinfo :: Directly insert the specified info into the index. - + --index-info:: Read index information from stdin. --chmod=(+|-)x:: - Set the execute permissions on the updated files. + Set the execute permissions on the updated files. --assume-unchanged, --no-assume-unchanged:: When these flags are specified, the object name recorded @@ -123,7 +126,7 @@ OPTIONS :: Files to act on. Note that files beginning with '.' are discarded. This includes - `./file` and `dir/./file`. If you don't want this, then use + `./file` and `dir/./file`. If you don't want this, then use cleaner names. The same applies to directories ending '/' and paths with '//' @@ -306,7 +309,8 @@ The command looks at `core.ignorestat` configuration variable. See See Also -------- -gitlink:git-config[1] +gitlink:git-config[1], +gitlink:git-add[1] Author @@ -320,4 +324,3 @@ Documentation by David Greaves, Junio C Hamano and the git-list