summaryrefslogtreecommitdiffstats
path: root/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-08-04 12:05:22 -0700
committerJunio C Hamano <gitster@pobox.com>2023-08-04 12:05:22 -0700
commit62908fd797899ccb5145cff3b16cc206d83b9b3f (patch)
tree141ad97bf44712f0ef6c881af1136aa47839f58a /gitmodules.txt
parent50a4df08cc234b607ebd8dfa811a68f23ba05fc4 (diff)
downloadgit-htmldocs-62908fd797899ccb5145cff3b16cc206d83b9b3f.tar.gz
Autogenerated HTML docs for v2.42.0-rc0
Diffstat (limited to 'gitmodules.txt')
-rw-r--r--gitmodules.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitmodules.txt b/gitmodules.txt
index dcee09b50..d9bec8b18 100644
--- a/gitmodules.txt
+++ b/gitmodules.txt
@@ -43,9 +43,9 @@ submodule.<name>.update::
command in the superproject. This is only used by `git
submodule init` to initialize the configuration variable of
the same name. Allowed values here are 'checkout', 'rebase',
- 'merge' or 'none'. See description of 'update' command in
- linkgit:git-submodule[1] for their meaning. For security
- reasons, the '!command' form is not accepted here.
+ 'merge' or 'none', but not '!command' (for security reasons).
+ See the description of the 'update' command in
+ linkgit:git-submodule[1] for more details.
submodule.<name>.branch::
A remote branch name for tracking updates in the upstream submodule.