I just did a
git commit -m "blah" then I added some files, how do I rollback and remove what is in my current files that have not yet been added/committed?
- 20no, this is not what the OP is asking -- it is clear that he wants to rollback to the last commit, not undo the last commit. he did not say he added some files and then commited them. so clearly he wants the last commit.Paul– Paul2016-10-21 17:41:24 +00:00Commented Oct 21, 2016 at 17:41
- 7It's too hard to find an answer to this super common questionSam– Sam2020-05-09 20:35:19 +00:00Commented May 9, 2020 at 20:35
Add a comment |
7 Answers
Edited Answer - edited over time to be more helpful
Caveat Emptor - Destructive commands ahead.
Mitigation - git reflog can save you if you need it.
UNDO local file changes and KEEP your last commit
git reset --hard
UNDO local file changes and REMOVE your last commit
git reset --hard HEAD^
KEEP local file changes and REMOVE your last commit
git reset --soft HEAD^
10 Comments
rudivonstaden
This command will delete your previous commit, so use with caution! git reset --hard is safer
Chris Nevill
WTF is this doing as the correct answer with 36 up votes. I've just lost a days work to this... because I read the answer not the comment. This is not the correct answer to the question!
Chris Nevill
OK all is not lost! You can do git reflog this will allow you to see commits you did before the reset. You can then checkout those commits
Joe Hanink
For what it's worth, I had interpreted the OP's question as "how do I rollback the commit and remove the current files", but it was and remains ambiguous. I would have understood differently if the OP had simply said "how do I remove the current files that have not been added or committed"
0xC0000022L
Git is the antithesis of Alan Kays statement Simple things should be simple, complex things should be possible. ... especially of its first part. Still, thank you for your answer. it helped.
|
If you want to remove newly added contents and files which are already staged (so added to the index) then you use:
git reset --hard If you want to remove also your latest commit (is the one with the message "blah") then better to use:
git reset --hard HEAD^ To remove the untracked files (so new files not yet added to the index) and folders use:
git clean --force -d 
3 Comments
user137717
does git reset --hard HEAD^ remove my latest commit permanently? like i can't go back to it?
Alexey Timokhin
it seems "git clean --force -d" also removes .gitignored folders
Hashim Aziz
@AlexeyTimokhin Yes, that's the purpose of it. Remove
-d if you want to avoid this.If you want to just uncommit the last commit use this:
git reset HEAD~ work like charm for me.
2 Comments
Deniz Kocaboğa
this is the exact answer to the question
amiabl
this should be the approved answer
git reset --hard will force the working directory back to the last commit and delete new/changed files.
4 Comments
Blankman
did that, but the files are still there. (untracked files are still there)
Otto
in this case you could do a "git stash"
Paul
upvoted because this is the only clear and unambigous answer to the OP's clear and unambiguous question.
Pathros
@Blankman Then first execute
git add -A, git status, and finally git reset --hard. git add -A will prevent the untracked files to be excluded from your git hard resetAn easy foolproof way to UNDO local file changes since the last commit is to place them in a new branch:
git branch changes git checkout changes git add . git commit This leaves the changes in the new branch. Return to the original branch to find it back to the last commit:
git checkout master The new branch is a good place to practice different ways to revert changes without risk of messing up the original branch.
Comments
You can revert a commit using git revert HEAD^ for reverting to the next-to-last commit. You can also specify the commit to revert using the id instead of HEAD^
1 Comment
Stefan Kendall
This doesn't "revert" in the sense you're saying. This creates a reverse-commit.
There are several ways, the simplest way to revert to the previous commit of the current branch is
git checkout HEAD~1 You can use HEAD~n , where "n" is an arbitrary number, to go back further.
You can also use the commit id of the "commit before last" to revert to that commit. Like so:
git checkout <commit id>
You can list commits in a convenient form with the git log command. To see the previous 2 commits and their messages:
git log --oneline -2 