Skip to content

Git Reverting Commits

Source: dev-notes/git-checkout-remote-branch.md at main · brotherkaif/dev-notes (github.com)

Revert and Keep Changes

[!NOTE] This solution works if the commit to be removed is the last committed one.

  • Copy the commit reference you like to go back to from the log:
git log
  • Reset git to the commit’s reference:
git reset <commit_ref>
  • Stash/Store the local changes from the wrong commit to use later after pushing to remote:
git stash
  • Push the changes to remote repository, (-f or --force):
git push -f
  • Get back the stored changes to local repository:
git stash apply
  • In case you have untracked/new files in the changes, you need to add them to git before committing:
git add .
  • Add whatever extra changes you need, then commit the needed files, (or use a dot ‘.’ instead of stating each file name, to commit all files in the local repository:
git commit -m "<new_commit_message>" <file1> <file2> ...

or,

git commit -m "<new_commit_message>" .

Backlinks:

list from [[Git Reverting Commits]] AND -"Changelog"

Jimmy Briggs jimmy.briggs@jimbrig.com | 2022