From 5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 Mon Sep 17 00:00:00 2001 From: Lukas_Sandström Date: Fri, 11 Nov 2005 02:12:27 +0100 Subject: Change 'cache' to 'index' in the docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- Documentation/diff-format.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/diff-format.txt') 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 :: compares the and the files on the filesystem. git-diff-index --cached :: - compares the and the cache. + compares the and the index. git-diff-tree [-r] [...]:: compares the trees named by the two arguments. git-diff-files [...]:: - 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. 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 -- cgit v1.3