0 votes
in Git by
How do I undo the most recent local commits in Git?

I accidentally committed the wrong files to Git, but didn't push the commit to the server yet.

How can I undo those commits from the local repository?

1 Answer

0 votes
by
Undo a commit & redo

$ git commit -m "Something terribly misguided" # (0: Your Accident)

$ git reset HEAD~                              # (1)

[ edit files as necessary ]                    # (2)

$ git add .                                    # (3)

$ git commit -c ORIG_HEAD                      # (4)

This command is responsible for the undo. It will undo your last commit while leaving your working tree (the state of your files on disk) untouched. You'll need to add them again before you can commit them again).

Make corrections to working tree files.

git add anything that you want to include in your new commit.

Commit the changes, reusing the old commit message. reset copied the old head to .git/ORIG_HEAD; commit with -c ORIG_HEAD will open an editor, which initially contains the log message from the old commit and allows you to edit it. If you do not need to edit the message, you could use the -C option.

Alternatively, to edit the previous commit (or just its commit message), commit --amend will add changes within the current index to the previous commit.

To remove (not revert) a commit that has been pushed to the server, rewriting history with git push origin master --force is necessary.

Related questions

0 votes
asked Jan 9, 2021 in Git by SakshiSharma
0 votes
asked Jan 9, 2021 in Git by SakshiSharma
...