Because... well, as awesome as people think git is, certain basic stuff are not that basic for git. Here's my collection because I'm getting tired of asking the same people for the same tricks over and over again :) Consider this a living document thingie...
Redirect a commit to a different branch:
git branch branch-name # copying the latest commit into separate branch
git reset HEAD^ --hard # going one commit back
git push origin -f # override it in the remote repository
git co branch-name # set branch-name as current branch
git push origin branch-name # push the local branch feature-filter to remote
Reintegrate branch
git checkout <branch-to-merge-into>
git pull
git merge <branch-to-reintegrate>
git pull
.gitconfig magic (default config and coloring):
[user]
name = Your Name
email = your@email.com
[color]
ui = true
[color "diff"]
whitespace = red reverse