diff options
| author | Lukas_Sandström <lukass@etek.chalmers.se> | 2005-11-11 02:12:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 15:12:29 -0800 |
| commit | 5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 (patch) | |
| tree | 4283a10bb54027c8d53e6807e159c0f2de8d6945 /Documentation/git-update-index.txt | |
| parent | 3cab3594e9cfd5e98cbcb819b1bed91a7b3a974b (diff) | |
| download | git-5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9.tar.gz | |
Change 'cache' to 'index' in the docs
This patch makes the documentation refer to the index
as index instead of cache, but some references still
remain. (e.g. git-update-index.txt)
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-update-index.txt')
| -rw-r--r-- | Documentation/git-update-index.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 58b9e49af5..52874c8562 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -21,7 +21,7 @@ SYNOPSIS DESCRIPTION ----------- Modifies the index or directory cache. Each file mentioned is updated -into the cache and any 'unmerged' or 'needs updating' state is +into the index and any 'unmerged' or 'needs updating' state is cleared. The way "git-update-index" handles files it is told about can be modified @@ -30,26 +30,26 @@ using the various options: OPTIONS ------- --add:: - If a specified file isn't in the cache already then it's + If a specified file isn't in the index already then it's added. Default behaviour is to ignore new files. --remove:: - If a specified file is in the cache but is missing then it's + If a specified file is in the index but is missing then it's removed. Default behaviour is to ignore removed file. --refresh:: - Looks at the current cache and checks to see if merges or + Looks at the current index 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 + Quiet. If --refresh finds that the index 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 + If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes git-update-index continue anyway. @@ -57,7 +57,7 @@ OPTIONS Ignores missing files during a --refresh --cacheinfo <mode> <object> <path>:: - Directly insert the specified info into the cache. + Directly insert the specified info into the index. --index-info:: Read index info from stdin. @@ -68,7 +68,7 @@ OPTIONS --info-only:: Do not create objects in the object database for all <file> arguments that follow this flag; just insert - their object IDs into the cache. + their object IDs into the index. --force-remove:: Remove the file from the index even when the working directory @@ -106,14 +106,14 @@ OPTIONS Using --refresh --------------- -'--refresh' does not calculate a new sha1 file or bring the cache +'--refresh' does not calculate a new sha1 file or bring the index up-to-date for mode/content changes. But what it *does* do is to -"re-match" the stat information of a file with the cache, so that you -can refresh the cache for a file that hasn't been changed but where +"re-match" the stat information of a file with the index, so that you +can refresh the index for a file that hasn't been changed but where the stat entry is out of date. For example, you'd want to do this after doing a "git-read-tree", to link -up the stat cache details with the proper files. +up the stat index details with the proper files. Using --cacheinfo or --info-only -------------------------------- |