Question

I just made a commit and accidentally left in some files I should have removed. How can I undo this commit without losing any of the work? I want to undo that commit, go in and remove 2 files and then recommit all the changes.

Thanks!

Answer 1

You don’t need to undo anything. As long as you haven’t pushed the commit:

git commit -a --amend -C HEAD

will amend the commit you just made, keeping the same commit message, committing any updated or deleted (but not untracked new) files.

---

so if i remove the files and then run that it will add it to the commit?

Yes, and if you want to be super-safe you can git rm the files and drop the -a flag:

git rm files/to/delete
git commit --amend -C HEAD