Merge branch 'jc/nodelta'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 076cebca1747ed8e35b71aefa2cae9d428a0d1e4..43e0d2266c04e6039095dbee709d736275b02838 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -124,7 +124,7 @@ which case it outputs:
 detailed information on unmerged paths.
 
 For an unmerged path, instead of recording a single mode/SHA1 pair,
-the dircache records up to three such pairs; one from tree O in stage
+the index records up to three such pairs; one from tree O in stage
 1, A in stage 2, and B in stage 3.  This information can be used by
 the user (or the porcelain) to see what should eventually be recorded at the
 path. (see git-read-tree for more information on state)