path: root/Documentation/glossary.txt
diff options
authorLukas_Sandström <>2005-11-11 01:12:27 (GMT)
committerJunio C Hamano <>2005-11-11 23:12:29 (GMT)
commit5f3aa197ac03eabbc45046cd3b9dbcfbda0426d9 (patch)
tree4283a10bb54027c8d53e6807e159c0f2de8d6945 /Documentation/glossary.txt
parent3cab3594e9cfd5e98cbcb819b1bed91a7b3a974b (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/glossary.txt')
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index eb7b471..07df6b4 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -43,14 +43,14 @@ DAG::
A collection of files with stat information, whose contents are
- stored as objects. The cache is a stored version of your working
+ stored as objects. The index is a stored version of your working
tree. Truth be told, it can also contain a second, and even a third
version of a working tree, which are used when merging.
index entry::
The information regarding a particular file, stored in the index.
An index entry can be unmerged, if a merge was started, but not
- yet finished (i.e. if the cache contains multiple versions of
+ yet finished (i.e. if the index contains multiple versions of
that file).
unmerged index:
@@ -75,7 +75,7 @@ checkout::
stored in the object database.
- As a verb: The action of storing the current state of the cache in the
+ As a verb: The action of storing the current state of the index in the
object database. The result is a revision.
As a noun: Short hand for commit object.