summaryrefslogtreecommitdiff
path: root/doc/university/training/topics/rollback_commits.md
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-11-13 16:07:16 +1000
committerEvan Read <eread@gitlab.com>2019-01-08 12:21:09 +1000
commitd98560c1f5c54127d1a48c4c8e326bbf06c31c4b (patch)
treeb2d2fc26829e0a7b25da18d09a1e7e07ba1efed8 /doc/university/training/topics/rollback_commits.md
parent710f2ec50c49d1e773acc20058ed584f1402de33 (diff)
downloadgitlab-ce-d98560c1f5c54127d1a48c4c8e326bbf06c31c4b.tar.gz
Make unordered lists conform to styleguidedocs/fix-unordered-list-style
- Also makes other minor Markdown fixes that were near the main fixes.
Diffstat (limited to 'doc/university/training/topics/rollback_commits.md')
-rw-r--r--doc/university/training/topics/rollback_commits.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/university/training/topics/rollback_commits.md b/doc/university/training/topics/rollback_commits.md
index 44304634f36..ca3a64e4347 100644
--- a/doc/university/training/topics/rollback_commits.md
+++ b/doc/university/training/topics/rollback_commits.md
@@ -8,13 +8,13 @@ comments: false
## Undo Commits
-* Undo last commit putting everything back into the staging area.
+- Undo last commit putting everything back into the staging area:
```
git reset --soft HEAD^
```
-* Add files and change message with:
+- Add files and change message with:
```
git commit --amend -m "New Message"
@@ -22,13 +22,13 @@ comments: false
----------
-* Undo last and remove changes
+- Undo last and remove changes:
```
git reset --hard HEAD^
```
-* Same as last one but for two commits back
+- Same as last one but for two commits back:
```
git reset --hard HEAD^^
@@ -73,9 +73,9 @@ git push origin master
## Note
-* 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
+- 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
```
# Changed file