summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:33:00 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-07 11:33:00 +0900
commit583cf6232a405e2535ad6a393b53387b290322c6 (patch)
tree1139500e9cc876c79f8e3338e87dd3a5c15fed79
parentMerge branch 'rs/nth-switch-code-simplification' (diff)
parentdoc: fix reference to --ignore-submodules (diff)
downloadtgif-583cf6232a405e2535ad6a393b53387b290322c6.tar.xz
Merge branch 'ah/doc-submodule-ignore-submodules'
Docfix. * ah/doc-submodule-ignore-submodules: doc: fix reference to --ignore-submodules
-rw-r--r--Documentation/gitmodules.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 08c7b8a722..f2a65ba0ca 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.
--