diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 15:06:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 15:06:29 +0300 |
commit | f03a645e7409882fe8b1aceca1735bc9051c612a (patch) | |
tree | 3d055c210ff663865e5c905cab208f74ebbcef2f /doc/university/training | |
parent | 0dea53d5e575c6c15ce7384da73b8d4a95b1c8cf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university/training')
-rw-r--r-- | doc/university/training/end-user/README.md | 4 | ||||
-rw-r--r-- | doc/university/training/topics/env_setup.md | 2 | ||||
-rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 2 | ||||
-rw-r--r-- | doc/university/training/user_training.md | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md index 40ad71df0be..4c86aedff8f 100644 --- a/doc/university/training/end-user/README.md +++ b/doc/university/training/end-user/README.md @@ -48,7 +48,7 @@ Workshop Time! ### Setup - Windows: Install 'Git for Windows' - - <https://git-for-windows.github.io> + - <https://gitforwindows.org> - Mac: Type `git` in the Terminal application. - If it's not installed, it will prompt you to install it. - Linux @@ -253,7 +253,7 @@ git push origin conflicts_branch -f - When to use `git merge` and when to use `git rebase` - Rebase when updating your branch with master - Merge when bringing changes from feature to master -- Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing/> +- Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing> ## Revert and Unstage diff --git a/doc/university/training/topics/env_setup.md b/doc/university/training/topics/env_setup.md index 92d2613c5d2..f65b4f68868 100644 --- a/doc/university/training/topics/env_setup.md +++ b/doc/university/training/topics/env_setup.md @@ -7,7 +7,7 @@ comments: false ## Install - **Windows** - - Install 'Git for Windows' from <https://git-for-windows.github.io> + - Install 'Git for Windows' from <https://gitforwindows.org> - **Mac** - Type '`git`' in the Terminal application. diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index 12798f7ff08..a01b3dbf3e0 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -63,4 +63,4 @@ git push origin conflicts_branch -f - When to use `git merge` and when to use `git rebase` - Rebase when updating your branch with master - Merge when bringing changes from feature to master -- Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing/> +- Reference: <https://www.atlassian.com/git/tutorials/merging-vs-rebasing> diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index 262b153e3e2..08b7635f9ce 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -39,7 +39,7 @@ Use the tools at your disposal when you get stuck. - Windows: Install 'Git for Windows' -> <https://git-for-windows.github.io> +> <https://gitforwindows.org> - Mac: Type '`git`' in the Terminal application. @@ -242,7 +242,7 @@ See GitLab merge requests for examples: <https://gitlab.com/gitlab-org/gitlab-fo 1. Create an annotated tag. 1. Push the tags to the remote repository. -Additional resources: <http://git-scm.com/book/en/Git-Basics-Tagging>. +Additional resources: <https://git-scm.com/book/en/v2/Git-Basics-Tagging>. ## Commands (tags) |