I amended a commit that was already pushed

Recovery steps

1. 1

   See both versions

   Your amended commit vs the one on the remote.

   Safe

   $ git fetch origin
   $ git log --oneline --graph HEAD origin/my-branch -n 5

2. 2

   Your own branch: push the amended version

   --force-with-lease refuses if someone else pushed in the meantime.

   Destructive

   $ git push --force-with-lease

3. 3

   Shared branch: turn the amend into a normal commit

   Go back to the remote version while keeping your changes, then commit them on top.

   Caution

   $ git reset --soft origin/main
   $ git commit -m "fix: what the amend was for"
   $ git push

These procedures are provided for information only. Read each command and adapt it to your situation before running it. Disclaimer

Other disasters