summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-07 02:33:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-07 02:33:00 (GMT)
commit583cf6232a405e2535ad6a393b53387b290322c6 (patch)
tree1139500e9cc876c79f8e3338e87dd3a5c15fed79 /Documentation/gitmodules.txt
parent337e3f2b49a954d1c3279fe71990cac8a4dfd447 (diff)
parent0d4304c124f6aef929f8f48c11dbbd071e9eaf59 (diff)
downloadgit-583cf6232a405e2535ad6a393b53387b290322c6.zip
git-583cf6232a405e2535ad6a393b53387b290322c6.tar.gz
git-583cf6232a405e2535ad6a393b53387b290322c6.tar.bz2
Merge branch 'ah/doc-submodule-ignore-submodules'
Docfix. * ah/doc-submodule-ignore-submodules: doc: fix reference to --ignore-submodules
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r--Documentation/gitmodules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 08c7b8a..f2a65ba 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -90,7 +90,7 @@ of 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. The 'git submodule' commands are not
+"--ignore-submodules" option. The 'git submodule' commands are not
affected by this setting.
--