How re-push a fixed commit on Git?

Question

I fixed some code and pushed it with an incorrect commit message. When I tried to fix the commit message, by accident I reverted the commit. The situation is now:

latest commit = correct commit message, but changes of previous commit undone
previous commit = correct commit content, but wrong commit message

All of this has already been pushed to the server.

I would like to get rid of the latest commit, change the commit message of the previous commit and push that back to the server.

I'm happy with solutions for Atlassian Source Tree but also command line is okay.

score 10 · Accepted Answer · edited May 23 '17 at 12:33

10

If it's the last commit, it's easy:

git commit --amend

This brings up the editor with the last commit message and lets you edit the message. (You can use -m if you want to wipe out the old message and use a new one.)

And then when you push, do this:

git push --force <repository> <branch>

Reference: Changing git commit message after push (given that no one pulled from remote)

edited May 23 '17 at 12:33

Community

1
1

answered Jun 09 '14 at 15:26

rafaels88

839
1
6
19

Please, be aware, that this won't work in case someone has already pulled this commit (they'll pull your new one and merge it with the existing one and push it again). – Isantipov Jun 09 '14 at 17:06
1

This is what I needed since nobody has pulled my commit yet. – Krumelur Jun 09 '14 at 19:43
Thank you so much, you just saved me from a massive f*****g headache. Kudos!! =) – Carl Finch Jan 05 '16 at 08:13

score 0 · Answer 2 · answered Jun 09 '14 at 17:19

You shouldn't amend a commit which has already been pushed publicly because your teammates probably have already pulled it and git will merge your new commit with the old commit when they pull and bring it back when they push (see this chapter in progit to understand details).

I suggest, that you leave it as it is (maybe just add a new commit with extended message so people get what you wanted in the original commit message after all).

In case you really need this to be wiped from history you'd need all your teammates who pulled your commit to rebase their new commits on your new version of the commit in question.

How re-push a fixed commit on Git?

2 Answers2