summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-07 21:53:22 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-07 21:53:22 +0000
commit7a4a283105c6ac21fcd7df88cf6a698281c2cd19 (patch)
tree9f36d659a94bca1891c86eb4cc9d7cb975806743 /user-manual.txt
parent330aae6bbe14d97917b66994484cabd0307d1873 (diff)
downloadgit-htmldocs-7a4a283105c6ac21fcd7df88cf6a698281c2cd19.tar.gz
Autogenerated HTML docs for v1.5.3-rc0-63-gc956
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/user-manual.txt b/user-manual.txt
index ff7c71d4f..c23077c72 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2957,13 +2957,13 @@ developed. If you blow the directory cache away entirely, you generally
haven't lost any information as long as you have the name of the tree
that it described.
-At the same time, the index is at the same time also the
-staging area for creating new trees, and creating a new tree always
-involves a controlled modification of the index file. In particular,
-the index file can have the representation of an intermediate tree that
-has not yet been instantiated. So the index can be thought of as a
-write-back cache, which can contain dirty information that has not yet
-been written back to the backing store.
+At the same time, the index is also the staging area for creating
+new trees, and creating a new tree always involves a controlled
+modification of the index file. In particular, the index file can
+have the representation of an intermediate tree that has not yet been
+instantiated. So the index can be thought of as a write-back cache,
+which can contain dirty information that has not yet been written back
+to the backing store.