Reverting Multiple commits in git

Question

I've tried the suggestions in posts under this heading to no avail. I also am trying to multiple commits back to a particular point in my project. My latest attempt was: git revert --no-commit f8fae3b..HEAD I got the following error:

error: your index file is unmerged

fatal:revert failed

What does git status produce (and what version of Git do you have installed)? (I think you are probably stuck in the middle of an ongoing revert right now, and if your Git is not too terribly ancient, git status will say so.) — torek
– torek, Commented Aug 30, 2017 at 18:01
Yes. git status revealed uncommitted stuff. I aborted the revert, commited the changes and reverted again. Worked! Thx all. — Robert
– Robert, Commented Sep 1, 2017 at 1:03

user1785721 · Accepted Answer · 2017-08-30 18:02:08Z

1

You have to commit first what you have in your index (staging), or just discard it. git status will help you.

answered Aug 30, 2017 at 18:02

user1785721

Sign up to request clarification or add additional context in comments.

Comments

Mark Adelsberger · Accepted Answer · 2017-08-30 19:03:08Z

0

You have uncommitted changes.

If you don't want those changes, you can throw them out.

git reset HEAD -- .
git checkout -- .

If the changes included new files, they might remain as "untracked"; if that seems like a problem you could git clean

If you do want the changes, you can either commit them (but then you have to make sure you don't accidentally discard them with your revert command) or stash them (git stash). (When you stash them, they'll seem to disappear; but then after you complete the revert you can git stash pop.)

answered Aug 30, 2017 at 19:03

Mark Adelsberger

46.6k4 gold badges42 silver badges60 bronze badges

Collectives™ on Stack Overflow

Reverting Multiple commits in git

2 Answers 2

Comments

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

2 Answers 2

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Related