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/diff-format.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/diff-format.txt')
-rw-r--r-- | Documentation/diff-format.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index d1d0d2d3dc..b426a14f5e 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -8,13 +8,13 @@ git-diff-index <tree-ish>:: compares the <tree-ish> and the files on the filesystem. git-diff-index --cached <tree-ish>:: - compares the <tree-ish> and the cache. + compares the <tree-ish> and the index. git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]:: compares the trees named by the two arguments. git-diff-files [<pattern>...]:: - compares the cache and the files on the filesystem. + compares the index and the files on the filesystem. An output line is formatted this way: @@ -47,7 +47,7 @@ That is, from the left to the right: . an LF or a NUL when '-z' option is used, to terminate the record. <sha1> is shown as all 0's if a file is new on the filesystem -and it is out of sync with the cache. +and it is out of sync with the index. Example: @@ -104,7 +104,7 @@ where: The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the -cache). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the +index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 |