Git: Squashing Commits

git rebase -i <commit> # rebase everything after the commit
# or 
git rebase -i HEAD~<n> # rebase the last <n> commits