@b0rk Didn't know about git rerere. Thanks for sharing! I suggest amending:
> use --force-with-lease when force pushing, to make sure that nobody else has pushed to the branch since you last fetch
to emphasize that fetching immediately before pushing this way defeats the protection of --force-with-lease. I've recommended this flag to less experienced developers eager to improve their Git skills, failing to make this gotcha crystal clear. On one or two occasions, it has led to lost work.