How to un-commit last un-pushed git commit without losing the changes

Question

Is there a way to revert a commit so that my local copy keeps the changes made in that commit  but they become non-committed changes in my working copy  Rolling back a commit takes you to the previous commit - I want to keep the changes made but I committed them to the wrong branch   This has not been pushed  only committed

User · Answer

With me mostly it happens when I push changes to the wrong branch and realize later  And following works in most of the time    git revert commit-hash git push  git checkout my-other-branch git revert revert-commit-hash git push    revert the commit   create and  checkout other branch revert the revert

User · Answer

If you pushed the changes  you can undo it and move the files back to stage without using another branch   git show HEAD  gt  patch git revert HEAD git apply patch   It will create a patch file that contain the last branch changes  Then it revert the changes  And finally  apply the patch files to the working tree

User · Answer

There are a lot of ways to do so  for example   in case you have not pushed the commit publicly yet   git reset HEAD 1 --soft      That s it  your commit changes will be in your working directory  whereas the LAST commit will be removed from your current branch  See git reset man    In case you did push publicly  on a branch called  master     git checkout -b MyCommit   save your commit in a separate branch just in case  so you don t have to dig it from reflog in case you screw up        revert commit normally and push   git checkout master git revert a8172f36  hash of the commit you want to destroy   this introduces a new commit  say  it s hash is 86b48ba  which removes changes  introduced in the commit in question  but those changes are still visible in the history  git push origin master   now if you want to have those changes as you local changes in your working copy   so that your local copy keeps the changes made in that commit   - just revert the revert commit with --no-commit option   git revert --no-commit 86b48ba  hash of the revert commit     I ve crafted a small example  https   github com Isantipov git-revert commits master

User · Answer

For the case   This has not been pushed  only committed   - if you use IntelliJ  or another JetBrains IDE  and you haven t pushed changes yet you can do next    Go to Version control window  Alt   9 Command   9  -  Log  tab    Right-click on a commit before your last one   Reset current branch to here  pick Soft       push the Reset button in the bottom of the dialog window    Done   This will  uncommit  your changes and return your git status to the point before your last local commit  You will not lose any changes you made

User · Answer

PLease make sure to backup your changes before running these commmand in a separate folder   git checkout branch name     Checkout on your branch   git merge --abort     Abort the merge   git status     Check status of the code after aborting the merge   git reset --hard origin branch name     these command will reset your changes and align your code with the branch name  branch  code

User · Answer

2020 simple way    git reset  lt commit hash gt    Commit hash of the last commit you want to keep

[git] How to un-commit last un-pushed git commit without losing the changes

Examples related to git