github – git revert
not allowed due to a merge but no -m option was given
You are trying to revert a merge commit, and git doesnt know which parent to revert to. The
-m allows us to choose which parent to choose. See the merge commit and note down which parent you want to go to. The parent information can be seen in
git log, for example:
Merge: dd3a24c 2462a52
git revert <hash> -m 1
1 indicates parent number 1 (dd3a24c).
If you are trying to revert to that commit, do:
git reset --hard <hash>
Understand the difference between
git revert and
git reset from the docs and decide which one you want.
git revert is the safer option, but doesnt really do what you want. It just reverts the changes of a (set of) commit.
git reset makes you move to a particular commit in history, and will rewrite your history.
I want to revert back to …
Then you dont want
git revert, at least not like this.
git revert is for reverting the specific changes made in that commit. What youre looking for is to revert or undo all the changes made after that commit.
git reset is the command to use here.
git reset --hard c14609d74eec3ccebafc73fa875ec58445471765 completely resets your branch, index and work tree to that specific commit.
Note that the usual precautions apply: if anyone else has fetched later commits already, removing them from the history like this complicates matters for them. If you instead want to create a new commit, which simply restores the state to that of commit c14609d74eec3ccebafc73fa875ec58445471765, you can use
git rm and
git rm -r . git checkout c14609d74eec3ccebafc73fa875ec58445471765 .
rm is needed to make sure newly added files also get removed.)
This lets you then create a new commit, on top of your local history, which undoes every change since c14609d74eec3ccebafc73fa875ec58445471765.