Kung-Fu

Squash (two) commits

git rebase --interactive HEAD~2

Merge branch to master (with squash)

git checkout master
git merge --squash bugfix
git commit

Checkout branch from remote

git fetch remote branch
git checkout -t remote/branch

Delete local and remote branch

git branch -D branch_name
git push <remote_name> --delete <branch_name>