summaryrefslogtreecommitdiff
path: root/Documentation/git-status.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 11:28:12 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-23 11:28:12 -0700
commitaa65b8602584fa91558b528527ff9008c1cceb69 (patch)
tree35621545c461be699ecdc9560d74e5457639cb67 /Documentation/git-status.txt
parent07da4e092f4ce90271f8545b1b50c1a272dfaefb (diff)
parentda0005b8853137c91e44867d899910d5c7eb4425 (diff)
downloadgit-aa65b8602584fa91558b528527ff9008c1cceb69.tar.gz
Merge branch 'nd/config-doc-camelCase'
Documentation updates. * nd/config-doc-camelCase: *config.txt: stick to camelCase naming convention
Diffstat (limited to 'Documentation/git-status.txt')
-rw-r--r--Documentation/git-status.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 4d8d530d35..b3319f7c2a 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -77,7 +77,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 +207,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