sparta93
sparta93

Reputation: 3854

How can I overwrite or replace a commit with new one once I have pushed to remote?

So I'm working on a sensitive project with a group and all our sources are on Github. I recently pushed a commit and later realized there were lot of mistakes in my push. I've since fixed all those mistakes on my local copy and am about to push again. However is there any way I can push and overwrite my last commit? My reason being, I don't want the others to look up my initial commit and the changes it had...

Basically I want to overwrite the old commit with my new one.. so no information about the old commit remains for other group members to see.

Upvotes: 56

Views: 87078

Answers (2)

Stijn Bernards
Stijn Bernards

Reputation: 1091

I would not advise you to do this as GIT isn't meant to remove and/or edit commits. You could just revert your previous commit and then commit the "valid" code again.

Or you can Rebase your branch. Or take a look at this Answer.

Upvotes: 1

ffledgling
ffledgling

Reputation: 12150

Usually, once something is out on Github (or a public repo), there's no way to make sure no one else has the bad commit.

If you simply want cleaner code history though, the way to do what you ask requires you to overwrite history both locally and on the remote project.

What you want is to either do a git commit --amend to modify your old commit if you've not already created a fresh commit with your changes.

If you've already created a fresh commit, you'll want to use git rebase -i to squash your commit on top of the old one.

After you've made this change locally, and verified your commit looks the way you want it to, you'll have to git push --force to overwrite history on the Github remote.

Here's a tutorial on how to re-write history in git, it explains both the approaches listed in this answer.

Upvotes: 72

Related Questions