Merge branch 'fixes'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 940285f8c8caf52f06ac2fb0008026a1425b24eb..f4501d62cd106635333ec4880f9d1c0aeacd8343 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -50,7 +50,7 @@ OPTIONS
 
 -k|--killed::
        Show files on the filesystem that need to be removed due
-       to file/directory conflicts for checkout-cache to
+       to file/directory conflicts for checkout-index to
        succeed.
 
 -z::