Some trickyness when setting up git

Tell git to remember your passwords forever with:
git config --global credential.helper store

Set your upstream forever with:
git config --global push.default current

Make git remove the annoying .orig files after merging:
git config --global mergetool.keepBackup false

Bonus commands:

Make git forget about a file that's already tracked:You've been tracking a file and realised it's not a good idea, so you added the file to the .gitignore, but git still wants to commit the changes you made to it, what do you do?

Make git forget about that file:

git rm --cached