{"thread":{"id":"2442","subject":"[PATCH] Change 'cache' to 'index' in the docs","startedAt":"2005-11-11T01:12:27Z","lastAt":"2005-11-11T15:35:03Z","messageCount":6,"participants":["Lukas Sandström","Junio C Hamano","Andreas Ericsson","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11538","messageId":"4373EFFB.6060802@etek.chalmers.se","threadId":"2442","inReplyTo":null,"subject":"[PATCH] Change 'cache' to 'index' in the docs","fromName":"Lukas Sandström","fromEmail":"lukass@etek.chalmers.se","sentAt":"2005-11-11T01:12:27Z","receivedAt":"2005-11-11T01:12:27Z","isPatch":true,"sender":{"key":"luksan@gmail.com","avatar":"https://avatars.githubusercontent.com/u/152281?v=4"},"body":"This patch makes the documentation refer to the index\nas index instead of cache, but some references still\nremain. (eg. git-update-index.txt)\n\nSigned-off-by: Lukas Sandström <lukass@etek.chalmers.se>\n\n---\ngit-update-index.txt says:\n\"Modifies the index or directory cache.\"\n\nI thought the index was the directory cache.\nIs git-update-index.txt badly worded or is there something\nI'm missing?\n\n Documentation/diff-format.txt        |    8 ++++----\n Documentation/diff-options.txt       |    2 +-\n Documentation/git-checkout-index.txt |   14 +++++++-------\n Documentation/git-cvsimport.txt      |    2 +-\n Documentation/git-diff-files.txt     |    6 +++---\n Documentation/git-diff-index.txt     |   14 +++++++-------\n Documentation/git-fsck-objects.txt   |    4 ++--\n Documentation/git-hash-object.txt    |    2 +-\n Documentation/git-ls-files.txt       |    2 +-\n Documentation/git-merge-index.txt    |    4 ++--\n Documentation/git-read-tree.txt      |   20 ++++++++++----------\n Documentation/git-svnimport.txt      |    2 +-\n Documentation/git-update-index.txt   |   24 ++++++++++++------------\n Documentation/git-write-tree.txt     |    8 ++++----\n Documentation/git.txt                |   18 +++++++++---------\n Documentation/glossary.txt           |    6 +++---\n Documentation/tutorial.txt           |    6 +++---\n 17 files changed, 71 insertions(+), 71 deletions(-)\n\napplies-to: 6466c53ae80cddbb581c5fdb2332f9321fade867\naa312f087d645cff65c7f86c91b5232898ec4f97\ndiff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt\nindex d1d0d2d..b426a14 100644\n--- a/Documentation/diff-format.txt\n+++ b/Documentation/diff-format.txt\n@@ -8,13 +8,13 @@ git-diff-index <tree-ish>::\n         compares the <tree-ish> and the files on the filesystem.\n \n git-diff-index --cached <tree-ish>::\n-        compares the <tree-ish> and the cache.\n+        compares the <tree-ish> and the index.\n \n git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::\n         compares the trees named by the two arguments.\n \n git-diff-files [<pattern>...]::\n-        compares the cache and the files on the filesystem.\n+        compares the index and the files on the filesystem.\n \n \n An output line is formatted this way:\n@@ -47,7 +47,7 @@ That is, from the left to the right:\n . an LF or a NUL when '-z' option is used, to terminate the record.\n \n <sha1> is shown as all 0's if a file is new on the filesystem\n-and it is out of sync with the cache.\n+and it is out of sync with the index.\n \n Example:\n \n@@ -104,7 +104,7 @@ where:\n The file parameters can point at the user's working file\n (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file`\n when a new file is added), or a temporary file (e.g. `old-file` in the\n-cache).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the\n+index).  'GIT_EXTERNAL_DIFF' should not worry about unlinking the\n temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits.\n \n For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 32005b0..8eef86e 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -50,7 +50,7 @@\n \t<orderfile>, which has one shell glob pattern per line.\n \n -R::\n-\tSwap two inputs; that is, show differences from cache or\n+\tSwap two inputs; that is, show differences from index or\n \ton-disk file to tree contents.\n \n For more detailed explanation on these common options, see also\ndiff --git a/Documentation/git-checkout-index.txt b/Documentation/git-checkout-index.txt\nindex 589dc9a..94b283a 100644\n--- a/Documentation/git-checkout-index.txt\n+++ b/Documentation/git-checkout-index.txt\n@@ -3,7 +3,7 @@ git-checkout-index(1)\n \n NAME\n ----\n-git-checkout-index - Copy files from the cache to the working directory\n+git-checkout-index - Copy files from the index to the working directory\n \n \n SYNOPSIS\n@@ -13,23 +13,23 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Will copy all files listed from the cache to the working directory\n+Will copy all files listed from the index to the working directory\n (not overwriting existing files).\n \n OPTIONS\n -------\n -u::\n \tupdate stat information for the checked out entries in\n-\tthe cache file.\n+\tthe index file.\n \n -q::\n-\tbe quiet if files exist or are not in the cache\n+\tbe quiet if files exist or are not in the index\n \n -f::\n \tforces overwrite of existing files\n \n -a::\n-\tchecks out all files in the cache.  Cannot be used\n+\tchecks out all files in the index.  Cannot be used\n \ttogether with explicit filenames.\n \n -n::\n@@ -57,7 +57,7 @@ supposed to be able to do things like:\n \n which will force all existing `*.h` files to be replaced with their\n cached copies. If an empty command line implied \"all\", then this would\n-force-refresh everything in the cache, which was not the point.\n+force-refresh everything in the index, which was not the point.\n \n To update and refresh only the files already checked out:\n \n@@ -74,7 +74,7 @@ desired tree into the index, and do a\n \n         git-checkout-index --prefix=git-export-dir/ -a\n \n-and git-checkout-index will \"export\" the cache into the specified\n+and git-checkout-index will \"export\" the index into the specified\n directory.\n \n NOTE The final \"/\" is important. The exported name is literally just\ndiff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt\nindex 4b62256..88bd3b0 100644\n--- a/Documentation/git-cvsimport.txt\n+++ b/Documentation/git-cvsimport.txt\n@@ -35,7 +35,7 @@ OPTIONS\n \n -i::\n \tImport-only: don't perform a checkout after importing.  This option\n-\tensures the working directory and cache remain untouched and will\n+\tensures the working directory and index remain untouched and will\n \tnot create them if they do not exist.\n \n -k::\ndiff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt\nindex e387388..3b04bfe 100644\n--- a/Documentation/git-diff-files.txt\n+++ b/Documentation/git-diff-files.txt\n@@ -3,7 +3,7 @@ git-diff-files(1)\n \n NAME\n ----\n-git-diff-files - Compares files in the working tree and the cache\n+git-diff-files - Compares files in the working tree and the index\n \n \n SYNOPSIS\n@@ -12,9 +12,9 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Compares the files in the working tree and the cache.  When paths\n+Compares the files in the working tree and the index.  When paths\n are specified, compares only those named paths.  Otherwise all\n-entries in the cache are compared.  The output format is the\n+entries in the index are compared.  The output format is the\n same as \"git-diff-index\" and \"git-diff-tree\".\n \n OPTIONS\ndiff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt\nindex 2fc3eed..d8fc78f 100644\n--- a/Documentation/git-diff-index.txt\n+++ b/Documentation/git-diff-index.txt\n@@ -3,7 +3,7 @@ git-diff-index(1)\n \n NAME\n ----\n-git-diff-index - Compares content and mode of blobs between the cache and repository\n+git-diff-index - Compares content and mode of blobs between the index and repository\n \n \n SYNOPSIS\n@@ -13,10 +13,10 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Compares the content and mode of the blobs found via a tree\n-object with the content of the current cache and, optionally\n+object with the content of the current index and, optionally\n ignoring the stat state of the file on disk.  When paths are\n specified, compares only those named paths.  Otherwise all\n-entries in the cache are compared.\n+entries in the index are compared.\n \n OPTIONS\n -------\n@@ -49,11 +49,11 @@ Cached Mode\n -----------\n If '--cached' is specified, it allows you to ask:\n \n-\tshow me the differences between HEAD and the current cache\n+\tshow me the differences between HEAD and the current index\n \tcontents (the ones I'd write with a \"git-write-tree\")\n \n For example, let's say that you have worked on your working directory, updated\n-some files in the cache and are ready to commit. You want to see eactly\n+some files in the index and are ready to commit. You want to see eactly\n *what* you are going to commit is without having to write a new tree\n object and compare it that way, and to do that, you just do\n \n@@ -92,7 +92,7 @@ which is obviously a very useful questio\n you *could* commit. Again, the output matches the \"git-diff-tree -r\"\n output to a tee, but with a twist.\n \n-The twist is that if some file doesn't match the cache, we don't have\n+The twist is that if some file doesn't match the index, we don't have\n a backing store thing for it, and we use the magic \"all-zero\" sha1 to\n show that. So let's say that you have edited `kernel/sched.c`, but\n have not actually done a \"git-update-index\" on it yet - there is no\n@@ -110,7 +110,7 @@ NOTE: As with other commands of this typ\n actually look at the contents of the file at all. So maybe\n `kernel/sched.c` hasn't actually changed, and it's just that you\n touched it. In either case, it's a note that you need to\n-\"git-upate-cache\" it to make the cache be in sync.\n+\"git-upate-index\" it to make the index be in sync.\n \n NOTE: You can have a mixture of files show up as \"has been updated\"\n and \"is still dirty in the working directory\" together. You can always\ndiff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt\nindex 5dc9dbd..37e8055 100644\n--- a/Documentation/git-fsck-objects.txt\n+++ b/Documentation/git-fsck-objects.txt\n@@ -33,7 +33,7 @@ index file and all SHA1 references in .g\n \tReport tags.\n \n --cache::\n-\tConsider any object recorded in the cache also as a head node for\n+\tConsider any object recorded in the index also as a head node for\n \tan unreachability trace.\n \n --standalone::\n@@ -125,7 +125,7 @@ GIT_OBJECT_DIRECTORY::\n \tused to specify the object database root (usually $GIT_DIR/objects)\n \n GIT_INDEX_FILE::\n-\tused to specify the index file of the cache\n+\tused to specify the index file of the index\n \n GIT_ALTERNATE_OBJECT_DIRECTORIES::\n \tused to specify additional object database roots (usually unset)\ndiff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt\nindex 9239f11..07d2c42 100644\n--- a/Documentation/git-hash-object.txt\n+++ b/Documentation/git-hash-object.txt\n@@ -16,7 +16,7 @@ Computes the object ID value for an obje\n with the contents of the named file (which can be outside of the\n work tree), and optionally writes the resulting object into the\n object database.  Reports its object ID to its standard output.\n-This is used by \"git-cvsimport\" to update the cache\n+This is used by \"git-cvsimport\" to update the index\n without modifying files in the work tree.  When <type> is not\n specified, it defaults to \"blob\". \n \ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 8c1784d..2f308ec 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -3,7 +3,7 @@ git-ls-files(1)\n \n NAME\n ----\n-git-ls-files - Information about files in the cache/working directory\n+git-ls-files - Information about files in the index/working directory\n \n \n SYNOPSIS\ndiff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt\nindex d072fda..6030642 100644\n--- a/Documentation/git-merge-index.txt\n+++ b/Documentation/git-merge-index.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-This looks up the <file>(s) in the cache and, if there are any merge\n+This looks up the <file>(s) in the index and, if there are any merge\n entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty\n argument if no file), and <file> as argument 4.  File modes for the three\n files are passed as arguments 5, 6 and 7.\n@@ -23,7 +23,7 @@ OPTIONS\n \tInterpret all following arguments as filenames.\n \n -a::\n-\tRun merge against all files in the cache that need merging.\n+\tRun merge against all files in the index that need merging.\n \n -o::\n \tInstead of stopping at the first failed merge, do all of them\ndiff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt\nindex 7db5fb5..e219c6a 100644\n--- a/Documentation/git-read-tree.txt\n+++ b/Documentation/git-read-tree.txt\n@@ -3,7 +3,7 @@ git-read-tree(1)\n \n NAME\n ----\n-git-read-tree - Reads tree information into the directory cache\n+git-read-tree - Reads tree information into the index\n \n \n SYNOPSIS\n@@ -13,11 +13,11 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Reads the tree information given by <tree-ish> into the directory cache,\n+Reads the tree information given by <tree-ish> into the index,\n but does not actually *update* any of the files it \"caches\". (see:\n git-checkout-index)\n \n-Optionally, it can merge a tree into the cache, perform a\n+Optionally, it can merge a tree into the index, perform a\n fast-forward (i.e. 2-way) merge, or a 3-way merge, with the -m\n flag.  When used with -m, the -u flag causes it to also update\n the files in the work tree with the result of the merge.\n@@ -59,10 +59,10 @@ provided.\n Single Tree Merge\n ~~~~~~~~~~~~~~~~~\n If only 1 tree is specified, git-read-tree operates as if the user did not\n-specify '-m', except that if the original cache has an entry for a\n+specify '-m', except that if the original index has an entry for a\n given pathname, and the contents of the path matches with the tree\n-being read, the stat info from the cache is used. (In other words, the\n-cache's stat()s take precedence over the merged tree's).\n+being read, the stat info from the index is used. (In other words, the\n+index's stat()s take precedence over the merged tree's).\n \n That means that if you do a \"git-read-tree -m <newtree>\" followed by a\n \"git-checkout-index -f -u -a\", the \"git-checkout-index\" only checks out\n@@ -96,7 +96,7 @@ Here are the \"carry forward\" rules:\n        -------------------------------------------------------\n       0 nothing             nothing  nothing  (does not happen)\n       1 nothing             nothing  exists   use M\n-      2 nothing             exists   nothing  remove path from cache\n+      2 nothing             exists   nothing  remove path from index\n       3 nothing             exists   exists   use M\n \n         clean I==H  I==M\n@@ -109,7 +109,7 @@ Here are the \"carry forward\" rules:\n       8 yes   N/A   no      nothing  exists   fail\n       9 no    N/A   no      nothing  exists   fail\n \n-     10 yes   yes   N/A     exists   nothing  remove path from cache\n+     10 yes   yes   N/A     exists   nothing  remove path from index\n      11 no    yes   N/A     exists   nothing  fail\n      12 yes   no    N/A     exists   nothing  fail\n      13 no    no    N/A     exists   nothing  fail\n@@ -128,7 +128,7 @@ Here are the \"carry forward\" rules:\n      20 yes   yes   no      exists   exists   use M\n      21 no    yes   no      exists   exists   fail\n \n-In all \"keep index\" cases, the cache entry stays as in the\n+In all \"keep index\" cases, the index entry stays as in the\n original index file.  If the entry were not up to date,\n git-read-tree keeps the copy in the work tree intact when\n operating under the -u flag.\n@@ -245,7 +245,7 @@ since you pulled from him:\n \n Your work tree is still based on your HEAD ($JC), but you have\n some edits since.  Three-way merge makes sure that you have not\n-added or modified cache entries since $JC, and if you haven't,\n+added or modified index entries since $JC, and if you haven't,\n then does the right thing.  So with the following sequence:\n \n     $ git-read-tree -m -u `git-merge-base $JC $LT` $JC $LT\ndiff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt\nindex 88bdc08..fcc79fa 100644\n--- a/Documentation/git-svnimport.txt\n+++ b/Documentation/git-svnimport.txt\n@@ -44,7 +44,7 @@ When importing incementally, you might n\n \n -i::\n \tImport-only: don't perform a checkout after importing.  This option\n-\tensures the working directory and cache remain untouched and will\n+\tensures the working directory and index remain untouched and will\n \tnot create them if they do not exist.\n \n -t <trunk_subdir>::\ndiff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt\nindex 58b9e49..52874c8 100644\n--- a/Documentation/git-update-index.txt\n+++ b/Documentation/git-update-index.txt\n@@ -21,7 +21,7 @@ SYNOPSIS\n DESCRIPTION\n -----------\n Modifies the index or directory cache. Each file mentioned is updated\n-into the cache and any 'unmerged' or 'needs updating' state is\n+into the index and any 'unmerged' or 'needs updating' state is\n cleared.\n \n The way \"git-update-index\" handles files it is told about can be modified\n@@ -30,26 +30,26 @@ using the various options:\n OPTIONS\n -------\n --add::\n-\tIf a specified file isn't in the cache already then it's\n+\tIf a specified file isn't in the index already then it's\n \tadded.\n \tDefault behaviour is to ignore new files.\n \n --remove::\n-\tIf a specified file is in the cache but is missing then it's\n+\tIf a specified file is in the index but is missing then it's\n \tremoved.\n \tDefault behaviour is to ignore removed file.\n \n --refresh::\n-\tLooks at the current cache and checks to see if merges or\n+\tLooks at the current index and checks to see if merges or\n \tupdates are needed by checking stat() information.\n \n -q::\n-        Quiet.  If --refresh finds that the cache needs an update, the\n+        Quiet.  If --refresh finds that the index needs an update, the\n         default behavior is to error out.  This option makes\n         git-update-index continue anyway.\n \n --unmerged::\n-        If --refresh finds unmerged changes in the cache, the default \n+        If --refresh finds unmerged changes in the index, the default\n         behavior is to error out.  This option makes git-update-index \n         continue anyway.\n \n@@ -57,7 +57,7 @@ OPTIONS\n \tIgnores missing files during a --refresh\n \n --cacheinfo <mode> <object> <path>::\n-\tDirectly insert the specified info into the cache.\n+\tDirectly insert the specified info into the index.\n \t\n --index-info::\n         Read index info from stdin.\n@@ -68,7 +68,7 @@ OPTIONS\n --info-only::\n \tDo not create objects in the object database for all\n \t<file> arguments that follow this flag; just insert\n-\ttheir object IDs into the cache.\n+\ttheir object IDs into the index.\n \n --force-remove::\n \tRemove the file from the index even when the working directory\n@@ -106,14 +106,14 @@ OPTIONS\n \n Using --refresh\n ---------------\n-'--refresh' does not calculate a new sha1 file or bring the cache\n+'--refresh' does not calculate a new sha1 file or bring the index\n up-to-date for mode/content changes. But what it *does* do is to\n-\"re-match\" the stat information of a file with the cache, so that you\n-can refresh the cache for a file that hasn't been changed but where\n+\"re-match\" the stat information of a file with the index, so that you\n+can refresh the index for a file that hasn't been changed but where\n the stat entry is out of date.\n \n For example, you'd want to do this after doing a \"git-read-tree\", to link\n-up the stat cache details with the proper files.\n+up the stat index details with the proper files.\n \n Using --cacheinfo or --info-only\n --------------------------------\ndiff --git a/Documentation/git-write-tree.txt b/Documentation/git-write-tree.txt\nindex 51be44d..abee05f 100644\n--- a/Documentation/git-write-tree.txt\n+++ b/Documentation/git-write-tree.txt\n@@ -3,7 +3,7 @@ git-write-tree(1)\n \n NAME\n ----\n-git-write-tree - Creates a tree object from the current cache\n+git-write-tree - Creates a tree object from the current index\n \n \n SYNOPSIS\n@@ -12,11 +12,11 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Creates a tree object using the current cache.\n+Creates a tree object using the current index.\n \n-The cache must be merged.\n+The index must be merged.\n \n-Conceptually, \"git-write-tree\" sync()s the current directory cache contents\n+Conceptually, \"git-write-tree\" sync()s the current index contents\n into a set of tree files.\n In order to have that match what is actually in your directory right\n now, you need to have done a \"git-update-index\" phase before you did the\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 2f9622f..b7bc4fb 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -40,7 +40,7 @@ reflect recent changes.\n Commands Overview\n -----------------\n The git commands can helpfully be split into those that manipulate\n-the repository, the cache and the working fileset, those that\n+the repository, the index and the working fileset, those that\n interrogate and compare them, and those that moves objects and\n references between repositories.\n \n@@ -59,7 +59,7 @@ gitlink:git-apply[1]::\n \tapplies it to the working tree.\n \n gitlink:git-checkout-index[1]::\n-\tCopy files from the cache to the working directory\n+\tCopy files from the index to the working directory\n \n gitlink:git-commit-tree[1]::\n \tCreates a new commit object\n@@ -86,7 +86,7 @@ gitlink:git-prune-packed[1]::\n \tRemove extra objects that are already in pack files.\n \n gitlink:git-read-tree[1]::\n-\tReads tree information into the directory cache\n+\tReads tree information into the directory index\n \n gitlink:git-unpack-objects[1]::\n \tUnpacks objects out of a packed archive.\n@@ -95,7 +95,7 @@ gitlink:git-update-index[1]::\n \tModifies the index or directory cache\n \n gitlink:git-write-tree[1]::\n-\tCreates a tree from the current cache\n+\tCreates a tree from the current index\n \n \n Interrogation commands\n@@ -105,10 +105,10 @@ gitlink:git-cat-file[1]::\n \tProvide content or type information for repository objects\n \n gitlink:git-diff-index[1]::\n-\tCompares content and mode of blobs between the cache and repository\n+\tCompares content and mode of blobs between the index and repository\n \n gitlink:git-diff-files[1]::\n-\tCompares files in the working tree and the cache\n+\tCompares files in the working tree and the index\n \n gitlink:git-diff-stages[1]::\n \tCompares two \"merge stages\" in the index file.\n@@ -120,7 +120,7 @@ gitlink:git-fsck-objects[1]::\n \tVerifies the connectivity and validity of the objects in the database\n \n gitlink:git-ls-files[1]::\n-\tInformation about files in the cache/working directory\n+\tInformation about files in the index/working directory\n \n gitlink:git-ls-tree[1]::\n \tDisplays a tree object in human readable form\n@@ -490,8 +490,8 @@ git so take care if using Cogito etc\n \n 'GIT_INDEX_FILE'::\n \tThis environment allows the specification of an alternate\n-\tcache/index file. If not specified, the default of\n-\t`$GIT_DIR/index` is used.\n+\tindex file. If not specified, the default of `$GIT_DIR/index`\n+\tis used.\n \n 'GIT_OBJECT_DIRECTORY'::\n \tIf the object storage directory is specified via this\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\nindex eb7b471..07df6b4 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -43,14 +43,14 @@ DAG::\n \n index::\n \tA collection of files with stat information, whose contents are\n-\tstored as objects. The cache is a stored version of your working\n+\tstored as objects. The index is a stored version of your working\n \ttree. Truth be told, it can also contain a second, and even a third\n \tversion of a working tree, which are used when merging.\n \n index entry::\n \tThe information regarding a particular file, stored in the index.\n \tAn index entry can be unmerged, if a merge was started, but not\n-\tyet finished (i.e. if the cache contains multiple versions of\n+\tyet finished (i.e. if the index contains multiple versions of\n \tthat file).\n \n unmerged index:\n@@ -75,7 +75,7 @@ checkout::\n \tstored in the object database.\n \n commit::\n-\tAs a verb: The action of storing the current state of the cache in the\n+\tAs a verb: The action of storing the current state of the index in the\n \tobject database. The result is a revision.\n \tAs a noun: Short hand for commit object.\n \ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 95ed852..03eb421 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -131,7 +131,7 @@ actually check in your hard work, you wi\n The first step is trivial: when you want to tell git about any changes\n to your working tree, you use the `git-update-index` program. That\n program normally just takes a list of filenames you want to update, but\n-to avoid trivial mistakes, it refuses to add new entries to the cache\n+to avoid trivial mistakes, it refuses to add new entries to the index\n (or remove existing ones) unless you explicitly tell it that you're\n adding a new entry with the `\\--add` flag (or removing an entry with the\n `\\--remove`) flag.\n@@ -199,7 +199,7 @@ was just to show that `git-update-index`\n actually saved away the contents of your files into the git object\n database.\n \n-Updating the cache did something else too: it created a `.git/index`\n+Updating the index did something else too: it created a `.git/index`\n file. This is the index that describes your current working tree, and\n something you should be very aware of. Again, you normally never worry\n about the index file itself, but you should be aware of the fact that\n@@ -440,7 +440,7 @@ a bit about what you have done.\n Write whatever message you want, and all the lines that start with '#'\n will be pruned out, and the rest will be used as the commit message for\n the change. If you decide you don't want to commit anything after all at\n-this point (you can continue to edit things and update the cache), you\n+this point (you can continue to edit things and update the index), you\n can just leave an empty message. Otherwise `git commit` will commit\n the change for you.\n \n---\n0.99.9.GIT\n"},{"id":"11541","messageId":"7voe4svufi.fsf@assigned-by-dhcp.cox.net","threadId":"2442","inReplyTo":"4373EFFB.6060802@etek.chalmers.se","subject":"Re: [PATCH] Change 'cache' to 'index' in the docs","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-11T01:34:41Z","receivedAt":"2005-11-11T01:34:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lukas Sandström <lukass@etek.chalmers.se> writes:\n\n> git-update-index.txt says:\n> \"Modifies the index or directory cache.\"\n>\n> I thought the index was the directory cache.\n> Is git-update-index.txt badly worded or is there something\n> I'm missing?\n\nNothing.  Just 'cache' is so ingrained to the brain of some/many\nof us that we let it go unnoticed, with an excuse that somewhere\nwe say \"index aka cache\".\n"},{"id":"11581","messageId":"43748566.2070204@op5.se","threadId":"2442","inReplyTo":"7voe4svufi.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Change 'cache' to 'index' in the docs","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2005-11-11T11:49:58Z","receivedAt":"2005-11-11T11:49:58Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Lukas Sandstr\u001b.A\u001bNvm <lukass@etek.chalmers.se> writes:\n> \n> \n>>git-update-index.txt says:\n>>\"Modifies the index or directory cache.\"\n>>\n>>I thought the index was the directory cache.\n>>Is git-update-index.txt badly worded or is there something\n>>I'm missing?\n> \n> \n> Nothing.  Just 'cache' is so ingrained to the brain of some/many\n> of us that we let it go unnoticed, with an excuse that somewhere\n> we say \"index aka cache\".\n> \n\nThis had me puzzled for quite some time. Some notice to the tutorial \nabout what's meant when it says \"tree-ish\" or \"commit-ish\" would be nice \n(I still haven't been able to figure it out).\n\nThe wording in git-diff-index.txt isn't exactly stellar either. The \ngit(7) man-page mentions that it's nice to read git-diff-index before \ndoing anything else, but it was just yesterday before I figured out that \nit can be used to produce a diff between an updated index and the \nchecked out working tree (which has led me to some fairly obscure \njuggling with patches and source-files to remember just what the hell it \nwas I changed).\n\nOh well. Perhaps I checked in all the wrong places.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"11587","messageId":"Pine.LNX.4.63.0511111514420.7575@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2442","inReplyTo":"43748566.2070204@op5.se","subject":"Re: [PATCH] Change 'cache' to 'index' in the docs","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-11T14:15:51Z","receivedAt":"2005-11-11T14:15:51Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 11 Nov 2005, Andreas Ericsson wrote:\n\n> This had me puzzled for quite some time. Some notice to the tutorial about\n> what's meant when it says \"tree-ish\" or \"commit-ish\" would be nice (I still\n> haven't been able to figure it out).\n\nSee glossary.txt.\n\n> The wording in git-diff-index.txt isn't exactly stellar either.\n\nAgree. Want to do something about it?\n\nCiao,\nDscho\n"},{"id":"11591","messageId":"4374ABF7.1010304@op5.se","threadId":"2442","inReplyTo":"Pine.LNX.4.63.0511111514420.7575@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [PATCH] Change 'cache' to 'index' in the docs","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2005-11-11T14:34:31Z","receivedAt":"2005-11-11T14:34:31Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Johannes Schindelin wrote:\n> Hi,\n> \n> On Fri, 11 Nov 2005, Andreas Ericsson wrote:\n> \n> \n>>This had me puzzled for quite some time. Some notice to the tutorial about\n>>what's meant when it says \"tree-ish\" or \"commit-ish\" would be nice (I still\n>>haven't been able to figure it out).\n> \n> \n> See glossary.txt.\n> \n\nAhhh. Terminology (here daft ole me was grep'ing away for \n\"nomenclature\"...). Thanks a million.\n\nAlthough it would be nice if it was mentioned up top with the other \n\"read these first\" files.\n\n> \n>>The wording in git-diff-index.txt isn't exactly stellar either.\n> \n> \n> Agree. Want to do something about it?\n> \n\nWhy not? Usually I can't even understand my own documentation, but it \nmight at least raise the discussion.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"},{"id":"11598","messageId":"Pine.LNX.4.63.0511111633520.16210@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"2442","inReplyTo":"4374ABF7.1010304@op5.se","subject":"Re: [PATCH] Change 'cache' to 'index' in the docs","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-11-11T15:35:03Z","receivedAt":"2005-11-11T15:35:03Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 11 Nov 2005, Andreas Ericsson wrote:\n\n> Johannes Schindelin wrote:\n> > \n> > > The wording in git-diff-index.txt isn't exactly stellar either.\n> > \n> > \n> > Agree. Want to do something about it?\n> > \n> \n> Why not? Usually I can't even understand my own documentation, but it \n> might at least raise the discussion.\n\n*grin* One thing I learnt developing Open Source: even the boring, tedious \ntasks can be fun, and the result very good, when working in a team.\n\nCiao,\nDscho\n"}]}