Git Rebase

$ git rebase -i HEAD~5 — Interactive rebase of the last 5 commits. The sweet thing here is you can clean up a commit history. You can also pass in a tag or hash range.
$ git rebase --continue — If you have to drop out of the rebase to resolve a conflict, after you add the merged file(s), this is how to start it up again.
$ git rebase --abort — Forget this.