Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-12 12:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-12 12:09:53 +0300
commitef012ef7571a42b961d49a74911e3dd1ac894c78 (patch)
treecd08645c61cf391aad09180a83d21b8d4818b580 /doc/ci/git_submodules.md
parent8ca719f247e416c44550e6259b87c893b2b4fc4d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/git_submodules.md')
-rw-r--r--doc/ci/git_submodules.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/git_submodules.md b/doc/ci/git_submodules.md
index b12ac59625f..5bcfe8fa3f1 100644
--- a/doc/ci/git_submodules.md
+++ b/doc/ci/git_submodules.md
@@ -94,10 +94,10 @@ correctly with your CI jobs:
whether you have recursive submodules.
The rationale to set the `sync` and `update` in `before_script` is because of
-the way Git submodules work. On a fresh Runner workspace, Git will set the
+the way Git submodules work. On a fresh runner workspace, Git will set the
submodule URL including the token in `.git/config`
(or `.git/modules/<submodule>/config`) based on `.gitmodules` and the current
-remote URL. On subsequent jobs on the same Runner, `.git/config` is cached
+remote URL. On subsequent jobs on the same runner, `.git/config` is cached
and already contains a full URL for the submodule, corresponding to the previous
job, and to **a token from a previous job**. `sync` allows to force updating
the full URL.