diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 12:06:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 12:06:07 +0000 |
commit | 45482d5a2704da7fabe4ccf07f85d9be6e0a791a (patch) | |
tree | 838353cda1b2a06a08799e852f3a7f338c715b44 /doc/university/training/topics | |
parent | 20450649ca3132e55aea60436fa6117ca6c1ae5f (diff) | |
download | gitlab-ce-45482d5a2704da7fabe4ccf07f85d9be6e0a791a.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university/training/topics')
-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 |
5 files changed, 7 insertions, 7 deletions
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' |