Use git checkout --force instead of short -f everywhere