kraihn/how-to-hotfix — pull request #3 by kraihn (2014-09-05 19:17:22+00:00)
Title: This is a clean hotfix commit history

This kind of hotfix commit can use `git cherry-pick` to easily update dev using a second pull request and a single commit. All commits that were made are squashed into a single logical commit to fix the bug.

To repeat post-hotfix completion, but pre-merge:

1. `git checkout qa && git pull origin qa`
2. `git checkout -b hotfix/qa-squash`
3. `git merge hotfix/qa --squash` and `git commit -m "Hoxfix complete"`
4. `git push --set-upstream origin hotfix/qa-squash`

To hotfix dev:

1. `git checkout dev && git pull origin dev`
2. `git checkout -b hotfix/dev`
3. `git cherry-pick 98126232d693d7d17d9fe5d0fb5644fea6576ab9`
4. `git push --set-upstream origin hotfix/dev`