Merge branch 'maint'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 8520b971111e8b015ac3d08b207a3ab37505ccca..79e0b7b71a126537091fdb159a1141036215fb63 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -3,7 +3,7 @@ git-ls-files(1)
 
 NAME
 ----
-git-ls-files - Information about files in the index/working directory
+git-ls-files - Show information about files in the index and the working tree
 
 
 SYNOPSIS