git revert commit/push but keep changes

git commit revert
James Gu picture James Gu · Apr 17, 2012 · Viewed 16.6k times · Source

It goes like this:

  • I have files A and B that I modified

  • I'm only suppose to commit and push A, but accidentally committed both and pushed both A and B

  • I did a "git push old-id:master" so on github it shows "Master is now old-id" where old-id is the last commit before me, so i think it's back to before i committed.

Question:

  • On my local, how do i undo the commit that has A and B, and commit only A, and push only A?

Note: I do need to keep the changes for both A and B on my local though. The end result should be:

  • Local - new A and new B
  • Github - new A and old B

Answer

Amber picture Amber · Apr 17, 2012 
$ git reset <old-id>    # Undo the commit after old-id
$ git add A             # stage A for a new commit
$ git commit            # make the new commit
$ git push              # push it

Related questions

Remove specific commit

I was working with a friend on a project, and he edited a bunch of files that shouldn't have been edited. Somehow I merged his work into mine, either when I pulled it, or when I tried to just pick …

Read More
git revert back to certain commit

how do i revert all my files on my local copy back to a certain commit? commit 4a155e5b3b4548f5f8139b5210b9bb477fa549de Author: John Doe <[email protected]> Date: Thu Jul 21 20:51:38 2011 …

Read More
GitHub - How to revert changes to previous state

I am using GitHub as my remote repository. I have already pushed 5 commits to the server and want to revert back to the state before the those commits. If the commit hash is 3425661dba2aadccdbab, how do I revert the …

Read More