summaryrefslogtreecommitdiff
path: root/Documentation/gitmodules.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 21:27:04 (GMT)
committerJohannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 15:30:38 (GMT)
commit7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab (patch)
treeae220474a41e8a55e2d4a2f98e297e117a1f6e16 /Documentation/gitmodules.txt
parent98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad (diff)
parent9877106b01cbd346b862cc8cd2c52e496dd40ed5 (diff)
downloadgit-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.zip
git-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.tar.gz
git-7c9fbda6e2e0ac4a491863253aeedeafb3cb9dab.tar.bz2
Sync with 2.18.2
* maint-2.18: (33 commits) Git 2.18.2 Git 2.17.3 Git 2.16.6 test-drop-caches: use `has_dos_drive_prefix()` Git 2.15.4 Git 2.14.6 mingw: handle `subst`-ed "DOS drives" mingw: refuse to access paths with trailing spaces or periods mingw: refuse to access paths with illegal characters unpack-trees: let merged_entry() pass through do_add_entry()'s errors quote-stress-test: offer to test quoting arguments for MSYS2 sh t6130/t9350: prepare for stringent Win32 path validation quote-stress-test: allow skipping some trials quote-stress-test: accept arguments to test via the command-line tests: add a helper to stress test argument quoting mingw: fix quoting of arguments Disallow dubiously-nested submodule git directories protect_ntfs: turn on NTFS protection by default path: also guard `.gitmodules` against NTFS Alternate Data Streams is_ntfs_dotgit(): speed it up ...
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 312b6f9..164995d 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.