Updated Squashing Commits (markdown)

Squashing-Commits.md

@@ -20,23 +20,23 @@ git push --force origin super-feature
 
 ## Alternatives
 1. Step-by-step commands
-```
+  ```
-# fetches the current upstream repository
+  # fetches the current upstream repository
-git fetch upstream
+  git fetch upstream
-# resets HEAD to the current upstream
+  # resets HEAD to the current upstream
-git checkout upstream/master
+  git checkout upstream/master
-# merges all commits from the local branch
+  # merges all commits from the local branch
-git merge --no-commit --squash super-feature
+  git merge --no-commit --squash super-feature
-# re-creates the branch starting from current HEAD (old commits will be lost)
+  # re-creates the branch starting from current HEAD (old commits will be lost)
-git checkout -B super-feature
+  git checkout -B super-feature
-# lets you edit the commit and checks in the changes (you can also use git commit -m "message")
+  # lets you edit the commit and checks in the changes (you can also use git commit -m "message")
-git commit -e
+  git commit -e
-# pushes the changes (in general, be careful with the --force parameter)
+  # pushes the changes (in general, be careful with the --force parameter)
-git push --force origin super-feature
+  git push --force origin super-feature
-```
+  ```
 
-1. Or, you can use rebase. Let's say you have 5 commits to squash and you don't have merge commits:
+1. <a name="simple"></a>Or, you can use rebase. Let's say you have 5 commits to squash and you don't have merge commits:
-```
+  ```
-git rebase -i HEAD~5
+  git rebase -i HEAD~5
-```
+  ```
-Change `pick` to `squash` for last four and update the commit message in the editor.
+  Change `pick` to `squash` for last four and update the commit message in the editor.