How to make `git push -f`" safe "

Question

Is there a way to use git push -fbut just origin/masternot changed since the last click?

I only want to reorganize the history, and not overwrite the contents of the file.

Answer 1

There is an option --force-with-leasefor git push . Performance

git push --force-with-lease

will do exactly what you want and only force update the remote branch if it is still on the same version as your remote tracking branch (i.e. origin/branch).

You can also specify a revision explicitly if you want to check a different version:

git push --force-with-lease=branch:someCommitHash