Merge branch 'ah/usage-strings'

diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 4d8d530d3542801337f7970b669514af3131ac99..335f3123353482cfd708420dac3b766f181e89ff 100644 (file)
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -41,6 +41,14 @@ OPTIONS
 --long::
        Give the output in the long-format. This is the default.
 
+-v::
+--verbose::
+       In addition to the names of files that have been changed, also
+       show the textual changes that are staged to be committed
+       (i.e., like the output of `git diff --cached`). If `-v` is specified
+       twice, then also show the changes in the working tree that
+       have not yet been staged (i.e., like the output of `git diff`).
+
 -u[<mode>]::
 --untracked-files[=<mode>]::
        Show untracked files.
@@ -58,7 +66,10 @@ When `-u` option is not used, untracked files and directories are
 shown (i.e. the same as specifying `normal`), to help you avoid
 forgetting to add newly created files.  Because it takes extra work
 to find untracked files in the filesystem, this mode may take some
-time in a large working tree.  You can use `no` to have `git status`
+time in a large working tree.
+Consider enabling untracked cache and split index if supported (see
+`git update-index --untracked-cache` and `git update-index
+--split-index`), Otherwise you can use `no` to have `git status`
 return more quickly without showing untracked files.
 +
 The default can be changed using the status.showUntrackedFiles
@@ -77,7 +88,7 @@ configuration variable documented in linkgit:git-config[1].
        only changes to the commits stored in the superproject are shown (this was
        the behavior before 1.7.0). Using "all" hides all changes to submodules
        (and suppresses the output of submodule summaries when the config option
-       `status.submodulesummary` is set).
+       `status.submoduleSummary` is set).
 
 --ignored::
        Show ignored files as well.
@@ -207,7 +218,7 @@ If the config variable `status.relativePaths` is set to false, then all
 paths shown are relative to the repository root, not to the current
 directory.
 
-If `status.submodulesummary` is set to a non zero number or true (identical
+If `status.submoduleSummary` is set to a non zero number or true (identical
 to -1 or an unlimited number), the submodule summary will be enabled for
 the long format and a summary of commits for modified submodules will be
 shown (see --summary-limit option of linkgit:git-submodule[1]). Please note