Replace the last 'dircache's by 'index'
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jakub Narebski committed
May 26, 2007 at 00:37 UTC
5adf317b31729707fad4967c1aef6cdba43d0dd3
2 files changed
+2
-2
Documentation/git-ls-files.txt
+1
-1
@@ -124,7 +124,7 @@ which case it outputs:
124
detailed information on unmerged paths.
125
126
For an unmerged path, instead of recording a single mode/SHA1 pair,
127
-the dircache records up to three such pairs; one from tree O in stage
127
+the index records up to three such pairs; one from tree O in stage
128
1, A in stage 2, and B in stage 3. This information can be used by
129
the user (or the porcelain) to see what should eventually be recorded at the
130
path. (see git-read-tree for more information on state)
diff.c
+1
-1
@@ -1258,7 +1258,7 @@ void fill_filespec(struct diff_filespec *spec, const unsigned char *sha1,
1258
}
1259
1260
/*
1261
- * Given a name and sha1 pair, if the dircache tells us the file in
1261
+ * Given a name and sha1 pair, if the index tells us the file in
1262
* the work tree has that object contents, return true, so that
1263
* prepare_temp_file() does not have to inflate and extract.
1264
*/