How do I push amended commit to the remote Git repository?

by

I actually once pushed with --force and .git repository and got scolded by Linus BIG TIME. In general this will create a lot of problems for other people. A simple answer is “Don’t do it”.

I see others gave the recipe for doing so anyway, so I won’t repeat them here. But here is a tip to recover from the situation after you have pushed out the amended commit with –force (or +master).

  1. Use git reflog to find the old commit that you amended (call it old, and we’ll call the new commit you created by amending new).
  2. Create a merge between old and new, recording the tree of new, like git checkout new && git merge -s ours old.
  3. Merge that to your master with git merge master
  4. Update your master with the result with git push . HEAD:master
  5. Push the result out.

Then people who were unfortunate enough to have based their work on the commit you obliterated by amending and forcing a push will see the resulting merge will see that you favor new over old. Their later merges will not see the conflicts between old and new that resulted from your amending, so they do not have to suffer.

More Related Contents:

  1. How to modify existing, unpushed commit messages?
  2. Edit the root commit in Git?
  3. How does git commit –amend work, exactly?
  4. How to amend a commit without changing commit message (reusing the previous one)?
  5. Accidentally pushed commit: change git commit message
  6. Message ‘src refspec master does not match any’ when pushing commits in Git
  7. How to change the commit author for one specific commit?
  8. How do I commit case-sensitive only filename changes in Git?
  9. How can I remove a commit on GitHub? [duplicate]
  10. Make the current commit the only (initial) commit in a Git repository?
  11. How do I resolve git saying “Commit your changes or stash them before you can merge”?
  12. Remove files from Git commit
  13. Removing multiple files from a Git repo that have already been deleted from disk
  14. How can I recover from an erronous git push -f origin master?
  15. What are the differences between “git commit” and “git push”?
  16. How to reference the initial commit?
  17. Recover files that were added to the index but then removed by a git reset
  18. How to undo “git commit –amend” done instead of “git commit”
  19. How to find the commit in which a given file was added?
  20. How do I commit only some files?
  21. Removing multiple files from a Git repo that have already been deleted from disk
  22. Commit only part of a file’s changes in Git
  23. How can I revert uncommitted changes including files and folders?
  24. How to see commits that were merged in to a merge commit?
  25. Remove a git commit which has not been pushed
  26. Using IntelliJ to amend git commit message
  27. Telling if a Git commit is a Merge/Revert commit
  28. Xcode 9 commit: Couldn’t communicate with helper application
  29. Why does ‘git commit’ not save my changes?
  30. Is it possible to set a git commit to have a timestamp prior to 1970?

Leave a Comment