diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 15:06:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 15:06:07 +0300 |
commit | 45482d5a2704da7fabe4ccf07f85d9be6e0a791a (patch) | |
tree | 838353cda1b2a06a08799e852f3a7f338c715b44 /doc/university/training | |
parent | 20450649ca3132e55aea60436fa6117ca6c1ae5f (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 | 10 | ||||
-rw-r--r-- | doc/university/training/topics/getting_started.md | 6 | ||||
-rw-r--r-- | doc/university/training/topics/merge_conflicts.md | 2 | ||||
-rw-r--r-- | doc/university/training/topics/rollback_commits.md | 2 | ||||
-rw-r--r-- | doc/university/training/topics/stash.md | 2 | ||||
-rw-r--r-- | doc/university/training/topics/unstage.md | 2 | ||||
-rw-r--r-- | doc/university/training/user_training.md | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/doc/university/training/end-user/README.md b/doc/university/training/end-user/README.md index 0ea51a95445..40ad71df0be 100644 --- a/doc/university/training/end-user/README.md +++ b/doc/university/training/end-user/README.md @@ -109,11 +109,11 @@ cd ~/workspace - GitLab is an application to code, test and deploy. - Provides repository management with access controls, code reviews, issue tracking, Merge Requests, and other features. -- The hosted version of GitLab is gitlab.com +- The hosted version of GitLab is <https://gitlab.com> ### New Project -- Sign in into your gitlab.com account +- Sign in into your <https://gitlab.com> account - Create a project - Choose to import from 'Any Repo by URL' and use <https://gitlab.com/gitlab-org/training-examples.git> - On your machine clone the `training-examples` project @@ -126,7 +126,7 @@ cd ~/workspace 1. Stage the file 1. Commit 1. Push the commit to the remote -1. View the git log +1. View the Git log ```shell # Edit `edit_this_file.rb` @@ -271,7 +271,7 @@ This will unstage the file but maintain the modifications. To revert the file ba git checkout -- <file> ``` -To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag: +To remove a file from disk and repo use `git rm` and to remove a directory use the `-r` flag: ```sh git rm '*.txt' @@ -338,7 +338,7 @@ git pull origin master git push origin master ``` -### git revert vs git reset +### `git revert` vs `git reset` Reset removes the commit while revert removes the changes but leaves the commit Revert is safer considering we can revert a revert diff --git a/doc/university/training/topics/getting_started.md b/doc/university/training/topics/getting_started.md index 3fadb58e804..bb197f3f1ed 100644 --- a/doc/university/training/topics/getting_started.md +++ b/doc/university/training/topics/getting_started.md @@ -65,7 +65,7 @@ Modified files that have been marked to go in the next commit. 1. Stage the file 1. Commit 1. Push the commit to the remote -1. View the git log +1. View the Git log ```sh # Edit `edit_this_file.rb` @@ -79,5 +79,5 @@ git log ## Note -- git fetch vs pull -- Pull is git fetch + git merge +- `git fetch` vs `git pull` +- Pull is `git fetch` + `git merge` diff --git a/doc/university/training/topics/merge_conflicts.md b/doc/university/training/topics/merge_conflicts.md index 97bb038f405..12798f7ff08 100644 --- a/doc/university/training/topics/merge_conflicts.md +++ b/doc/university/training/topics/merge_conflicts.md @@ -60,7 +60,7 @@ git push origin conflicts_branch -f ## Note -- When to use 'git merge' and when to use 'git rebase' +- 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/> diff --git a/doc/university/training/topics/rollback_commits.md b/doc/university/training/topics/rollback_commits.md index c17e8d59737..333b2f23a1b 100644 --- a/doc/university/training/topics/rollback_commits.md +++ b/doc/university/training/topics/rollback_commits.md @@ -62,7 +62,7 @@ git push origin master ## Note -- git revert vs git reset +- `git revert` vs `git reset` - Reset removes the commit while revert removes the changes but leaves the commit - Revert is safer considering we can revert a revert diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md index d3e63db0c6a..c582240d0f7 100644 --- a/doc/university/training/topics/stash.md +++ b/doc/university/training/topics/stash.md @@ -4,7 +4,7 @@ comments: false # Git Stash -We use git stash to store our changes when they are not ready to be committed +We use `git stash` to store our changes when they are not ready to be committed and we need to change to a different branch. - Stash: diff --git a/doc/university/training/topics/unstage.md b/doc/university/training/topics/unstage.md index d7482bf2bd5..9a9d42221a4 100644 --- a/doc/university/training/topics/unstage.md +++ b/doc/university/training/topics/unstage.md @@ -16,7 +16,7 @@ comments: false git checkout -- <file> ``` -- To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag: +- To remove a file from disk and repo use `git rm` and to remove a directory use the `-r` flag: ```sh git rm '*.txt' diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index 231039b0be8..262b153e3e2 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -140,7 +140,7 @@ Modified files that have been marked to go in the next commit. 1. Stage the file. 1. Commit. 1. Push the commit to the remote. -1. View the git log. +1. View the Git log. ## Commands (committing) |