Merge branch 'maint-1.6.0' into maint

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index a6883bf43b0f7ca1adec5dfe4c65ce7f08d20afb..9f85d60b5fb6d6ae1b4d8c2e65a6131cbe21450b 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -53,7 +53,7 @@ OPTIONS
 
 -s::
 --stage::
-       Show stage files in the output
+       Show staged contents' object name, mode bits and stage number in the output.
 
 --directory::
        If a whole directory is classified as "other", show just its
@@ -143,7 +143,7 @@ which case it outputs:
 
         [<tag> ]<mode> <object> <stage> <file>
 
-`git-ls-files --unmerged` and `git-ls-files --stage` can be used to examine
+'git-ls-files --unmerged' and 'git-ls-files --stage' can be used to examine
 detailed information on unmerged paths.
 
 For an unmerged path, instead of recording a single mode/SHA1 pair,
@@ -160,7 +160,7 @@ respectively.
 Exclude Patterns
 ----------------
 
-`git-ls-files` can use a list of "exclude patterns" when
+'git-ls-files' can use a list of "exclude patterns" when
 traversing the directory tree and finding files to show when the
 flags --others or --ignored are specified.  linkgit:gitignore[5]
 specifies the format of exclude patterns.
@@ -176,7 +176,7 @@ These exclude patterns come from these places, in order:
      in the same order they appear in the file.
 
   3. command line flag --exclude-per-directory=<name> specifies
-     a name of the file in each directory `git-ls-files`
+     a name of the file in each directory 'git-ls-files'
      examines, normally `.gitignore`.  Files in deeper
      directories take precedence.  Patterns are ordered in the
      same order they appear in the files.