summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-09-24 23:36:08 -0700
committerJonathan Nieder <jrnieder@gmail.com>2013-09-24 23:36:08 -0700
commit5636a20070c80dec23cc6d6180cb1dd958e23bca (patch)
tree78ae41beca656e291696a58addf5a597b2d42018 /Documentation/gitmodules.txt
parent80f165a58a41ffd37ec24022db8e568bc5165075 (diff)
parentbb58b696c6ad810560d361b640580715a90382cb (diff)
downloadgit-5636a20070c80dec23cc6d6180cb1dd958e23bca.tar.gz
Merge branch 'bc/submodule-status-ignored'
* bc/submodule-status-ignored: Improve documentation concerning the status.submodulesummary setting submodule: don't print status output with ignore=all submodule: fix confusing variable name
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r--Documentation/gitmodules.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 6a1ca4abad..f7be93f631 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -75,7 +75,8 @@ submodule.<name>.ignore::
the superproject, the setting there will override the one found in
.gitmodules.
Both settings can be overridden on the command line by using the
- "--ignore-submodule" option.
+ "--ignore-submodule" option. The 'git submodule' commands are not
+ affected by this setting.
EXAMPLES