diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-12 06:08:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-12 06:08:22 +0300 |
| commit | 1b5db0f4a6ee2fc490aec0b8bed7d78d4ecc7996 (patch) | |
| tree | 07050be1d311b1ea1f17e252d516d3d805f3b3aa /doc/university | |
| parent | ee936c190ec1f3e691650ce20ec89b076b3a6ca5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/university')
| -rw-r--r-- | doc/university/training/user_training.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/university/training/user_training.md b/doc/university/training/user_training.md index 2d53edfbd85..d2def1f3199 100644 --- a/doc/university/training/user_training.md +++ b/doc/university/training/user_training.md @@ -314,7 +314,7 @@ Squash the commits on the same branch we used for the merge conflicts step. git rebase -i master ``` -In the editor, leave the first commit as 'pick' and set others to 'fixup'. +In the editor, leave the first commit as `pick` and set others to `fixup`. ## Questions? |