The -f option for the git push command, which is an alias for --force, should be re-aliased to --force-with-lease.

#Git