From: Junio C Hamano Date: Tue, 28 Apr 2015 20:00:18 +0000 (-0700) Subject: Merge branch 'mg/status-v-v' X-Git-Tag: v2.4.0~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5b9496768faba9378a685a2c750c29eb5662332a?ds=inline;hp=-c Merge branch 'mg/status-v-v' * mg/status-v-v: status: document the -v/--verbose option --- 5b9496768faba9378a685a2c750c29eb5662332a diff --combined Documentation/git-status.txt index b3319f7c2a,19c7661fac..5221f950ce --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@@ -41,6 -41,14 +41,14 @@@ OPTION --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[]:: --untracked-files[=]:: Show untracked files. @@@ -77,7 -85,7 +85,7 @@@ configuration variable documented in li 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 -215,7 +215,7 @@@ If the config variable `status.relative 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