diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-04 22:21:20 +0100 |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-12-06 16:29:15 +0100 |
commit | 14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2 (patch) | |
tree | d8127060ce208c40c4f5dd67a412171154e362c6 /Documentation/gitmodules.txt | |
parent | 268fbcd172cdb306e8a3e7143cc16677c963d6cd (diff) | |
parent | a5ab8d03173458b76b8452efd90a7173f490c132 (diff) | |
download | git-14af7ed5a9c9c0ff2ea347bf54ed2af4b0e10cc2.tar.gz |
Sync with 2.17.3
* maint-2.17: (32 commits)
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
mingw: disallow backslash characters in tree objects' file names
...
Diffstat (limited to 'Documentation/gitmodules.txt')
-rw-r--r-- | Documentation/gitmodules.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 4d63def206..4caf5d8e3f 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. |