summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-10 06:17:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-10 06:17:55 (GMT)
commit7034cd094bda4edbcdff7fad1a28fcaaf9b9a040 (patch)
treee0b837c5e5a2ea2fce3255ef59fd981e2bd30374 /Documentation/gitmodules.txt
parent559c6fc317f92a0a3994f816d3513cd322745852 (diff)
parent53a06cf39b756eddfe4a2a34da93e3d04eb7b728 (diff)
downloadgit-7034cd094bda4edbcdff7fad1a28fcaaf9b9a040.zip
git-7034cd094bda4edbcdff7fad1a28fcaaf9b9a040.tar.gz
git-7034cd094bda4edbcdff7fad1a28fcaaf9b9a040.tar.bz2
Sync with Git 2.24.1
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r--Documentation/gitmodules.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 953c387..b5d1c05 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -44,9 +44,8 @@ submodule.<name>.update::
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. Note that the
- '!command' form is intentionally ignored here for security
- reasons.
+ linkgit:git-submodule[1] for their meaning. For security
+ reasons, the '!command' form is not accepted here.
submodule.<name>.branch::
A remote branch name for tracking updates in the upstream submodule.