diff options
Diffstat (limited to 'doc/university/training/topics')
| -rw-r--r-- | doc/university/training/topics/env_setup.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/explore_gitlab.md | 3 | ||||
| -rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/stash.md | 2 | ||||
| -rw-r--r-- | doc/university/training/topics/unstage.md | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/doc/university/training/topics/env_setup.md b/doc/university/training/topics/env_setup.md index cbe2ce46be4..f616ad4e49f 100644 --- a/doc/university/training/topics/env_setup.md +++ b/doc/university/training/topics/env_setup.md @@ -12,7 +12,7 @@ comments: false - **Windows** - Install 'Git for Windows' from [Git for Windows](https://gitforwindows.org). - **Mac** - Type '`git`' in the Terminal application. - - If it's not installed, it will prompt you to install it. + - If it's not installed, it prompts you to install it. - **GNU/Linux** - Enter `which git` in the Terminal application and press <kbd>Enter</kbd> to determine if Git is installed on your system. diff --git a/doc/university/training/topics/explore_gitlab.md b/doc/university/training/topics/explore_gitlab.md index 8678f8fd9eb..584069aa7b0 100644 --- a/doc/university/training/topics/explore_gitlab.md +++ b/doc/university/training/topics/explore_gitlab.md @@ -3,3 +3,6 @@ redirect_to: '../../../gitlab-basics/README.md' --- This document was moved to [another location](../../../gitlab-basics/README.md). + +<!-- This redirect file can be deleted after February 1, 2021. --> +<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page --> diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index 87cb119768f..38cc14d4593 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -42,7 +42,7 @@ git commit -am "add line6 and line7" git push origin master ``` -Create a merge request on the GitLab web UI. You'll see a conflict warning. +Create a merge request on the GitLab web UI, and a conflict warning displays. ```shell git checkout conflicts_branch diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md index db4a21da6ba..393f0490b83 100644 --- a/doc/university/training/topics/stash.md +++ b/doc/university/training/topics/stash.md @@ -55,7 +55,7 @@ and we need to change to a different branch. ``` - If we meet conflicts we need to either reset or commit our changes. -- Conflicts through `pop` will not drop a stash afterwards. +- Conflicts through `pop` doesn't drop a stash afterwards. ## Git Stash sample workflow diff --git a/doc/university/training/topics/unstage.md b/doc/university/training/topics/unstage.md index 77aca3cdab8..4f0ac3652a7 100644 --- a/doc/university/training/topics/unstage.md +++ b/doc/university/training/topics/unstage.md @@ -7,7 +7,7 @@ comments: false # Unstage -- To remove files from stage use reset HEAD where HEAD is the last commit of the current branch. This will unstage the file but maintain the modifications. +- To remove files from stage use reset HEAD where HEAD is the last commit of the current branch. This unstages the file but maintain the modifications. ```shell git reset HEAD <file> |