diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /doc/university/training | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'doc/university/training')
| -rw-r--r-- | doc/university/training/end-user/README.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/agile_git.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md index 5fc65bb8a58..0465f48bb34 100644 --- a/doc/university/training/end-user/README.md +++ b/doc/university/training/end-user/README.md @@ -278,7 +278,7 @@ git rm '*.txt' git rm -r <dirname> ``` -If we want to remove a file from the repository but keep it on disk, say we forgot to add it to our .gitignore file then use `--cache`: +If we want to remove a file from the repository but keep it on disk, say we forgot to add it to our `.gitignore` file then use `--cache`: ```shell git rm <filename> --cache diff --git a/doc/university/training/topics/agile_git.md b/doc/university/training/topics/agile_git.md index 6434b710159..c5634bec27b 100644 --- a/doc/university/training/topics/agile_git.md +++ b/doc/university/training/topics/agile_git.md @@ -20,7 +20,7 @@ Branching in an Agile environment usually happens around user stories with one or more developers working on it. If more than one developer then another branch for each developer is also used -with their initials, and US id. +with their initials, and US ID. After its tested merge into master and remove the branch. |