diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
| commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
| tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/Documentation/gitmodules.txt | |
| parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) | |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/Documentation/gitmodules.txt')
| -rw-r--r-- | third_party/git/Documentation/gitmodules.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/third_party/git/Documentation/gitmodules.txt b/third_party/git/Documentation/gitmodules.txt index 67275fd187f0..a66e95b70c36 100644 --- a/third_party/git/Documentation/gitmodules.txt +++ b/third_party/git/Documentation/gitmodules.txt @@ -44,8 +44,9 @@ 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. For security - reasons, the '!command' form is not accepted here. + linkgit:git-submodule[1] for their meaning. Note that the + '!command' form is intentionally ignored here for security + reasons. submodule.<name>.branch:: A remote branch name for tracking updates in the upstream submodule. @@ -80,7 +81,7 @@ submodule.<name>.ignore:: Committed differences and modifications to tracked files will show up. - none;; No modifications to submodules are ignored, all of committed + none;; No modifiations to submodules are ignored, all of committed differences, and modifications to tracked and untracked files are shown. This is the default option. @@ -89,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-submodules" option. The 'git submodule' commands are not +"--ignore-submodule" option. The 'git submodule' commands are not affected by this setting. -- @@ -104,15 +105,14 @@ EXAMPLES Consider the following .gitmodules file: ----- -[submodule "libfoo"] - path = include/foo - url = git://foo.com/git/lib.git + [submodule "libfoo"] + path = include/foo + url = git://foo.com/git/lib.git + + [submodule "libbar"] + path = include/bar + url = git://bar.com/git/lib.git -[submodule "libbar"] - path = include/bar - url = git://bar.com/git/lib.git ----- This defines two submodules, `libfoo` and `libbar`. These are expected to be checked out in the paths `include/foo` and `include/bar`, and for both @@ -120,7 +120,7 @@ submodules a URL is specified which can be used for cloning the submodules. SEE ALSO -------- -linkgit:git-submodule[1], linkgit:gitsubmodules[7], linkgit:git-config[1] +linkgit:git-submodule[1] linkgit:git-config[1] GIT --- |