git

• git reflog very useful when undoing mistakes like accidental git checkout a change, hard resets, or bad rebases
• git pull --rebase - I often check out others’ branches so I can reproduce something they’re looking at locally. Of course, they’re making changes all the time so I’ll need to pull those changes down, and I don’t want any changes I’ve made to result in merge commits etc - so this is preferred in this case.