How do I un-revert a reverted Git commit

Question

Given a change that has been committed using commit  and then reverted using revert  what is the best way to then undo that revert   Ideally  this should be done with a new commit  so as to not re-write history

User · Accepted Answer

If you haven t pushed that change yet  git reset --hard HEAD   Otherwise  reverting the revert is perfectly fine   Another way is to git checkout HEAD   --   and then git add -A  amp  amp  git commit

User · Answer

It is looks stupid for me  But I had been in the same situation and I did revert for reverted commits  I did number reverts so I had to do revert for each  revert commit    Now my commits history looks a weird a bit     It is a pet project so it is OK  But for real-life project I would give preference to go to last commit before reverted restore all reverted code together in one commit and more reasonable comment

User · Answer

After the initial panic of accidentally deleting all my files  I used the following to get my data back git reset HEAD  1           git fsck --lost-found       git show  git revert  lt sha that deleted the files gt

User · Answer

Or you could git checkout -b  lt new-branch gt  and git cherry-pick  lt commit gt  the before to the  and git rebase to drop revert commit  send pull request like before

User · Answer

A revert commit is just like any other commit in git  Meaning  you can revert it  as in   git revert 648d7d808bc1bca6dbf72d93bf3da7c65a9bd746   That obviously only makes sense once the changes were pushed  and especially when you can t force push onto the destination branch  which is a good idea for your master branch   If the change has not been pushed  just do cherry-pick  revert or simply remove the revert commit as per other posts    In our team  we have a rule to use a revert on Revert commits that were committed in the main branch  primarily to keep the history clean  so that you can see which commit reverts what          7963f4b2a9d   Revert  Revert  OD-9033 parallel reporting configuration         This reverts commit a0e5e86d3b66cf206ae98a9c989f649eeba7965f                               a0e5e86d3b6    Revert  OD-9055 paralel reporting configuration       This reverts commit 648d7d808bc1bca6dbf72d93bf3da7c65a9bd746                           Merge pull request parallel reporting dbs to master  commit       648d7d808bc1bca6dbf72d93bf3da7c65a9bd746    This way  you can trace the history and figure out the whole story  and even those without the knowledge of the legacy could work it out for themselves  Whereas  if you cherry-pick or rebase stuff  this valuable information is lost  unless you include it in the comment    Obviously  if a commit reverted and re-reverted more than once that becomes quite messy

User · Answer

To get back the unstaged and staged changes which were reverted after a commit   git reset HEAD  1    To recover all unstaged deletions   git ls-files -d   xargs git checkout --

User · Answer

Reverting the revert will do the trick  For example   If abcdef is your commit and ghijkl is the commit you have when you reverted the commit abcdef  then run   git revert ghijkl   This will revert the revert

User · Answer

If you don t like the idea of  reverting a revert   especially when that means losing history information for many commits   you can always head to the git documentation about  Reverting a faulty merge    Given the following starting situation   P---o---o---M---x---x---W---x                  A---B---C----------------D---E    lt -- fixed-up topic branch    W is your initial revert of the merge M  D and E are fixes to your initially broken feature branch commit   You can now simply replay commits A to E  so that none of them  belongs  to the reverted merge     git checkout E   git rebase --no-ff P   The new copy of your branch can now be merged to master again      A ---B ---C ------------D ---E    lt -- recreated topic branch      P---o---o---M---x---x---W---x                  A---B---C----------------D---E

User · Answer

Here s how I did it  If the branch my branchname was included in a merge that got reverted  And I wanted to unrevert my branchname      I first do a git checkout -b my new branchname from my branchname  Then I do a git reset --soft  COMMIT HASH where  COMMIT HASH is the commit hash of the commit right before the first commit of my branchname  see git log  Then I make a new commit git commit -m  Add back reverted changes  Then I push up the new branch git push origin new branchname Then I made a pull request for the new branch

User · Answer

I had an issue somebody made a revert to master to my branch  but I was needed to be able to merge it again but the problem is that the revert included all my commit  Lets look at that case we created our feature branch from M1 we merge our feature branch in M3 and revert on it in RM3 M1 - gt  M2 - gt  M3 - gt  M4-  gt  RM3 - gt  M5                 F1- gt F2 -  How to make the F2 able to merge to M5  git checkout master git checkout -b brach-before-revert git reset --hard M4 git checkout master git checkout -b new-feature-branch git reset --hard M1  git merge --squash brach-before-revert

User · Answer

git cherry-pick  lt original commit sha gt  Will make a copy of the original commit  essentially re-applying the commit  Reverting the revert will do the same thing  with a messier commit message  git revert  lt commit sha of the revert gt   Either of these ways will allow you to git push without overwriting history  because it creates a new commit after the revert  When typing the commit sha  you typically only need the first 5 or 6 characters  git cherry-pick 6bfabc

[git] How do I "un-revert" a reverted Git commit?

Examples related to git

Examples related to undo

Examples related to revert