git reset –hard 4a155e5 Will move the HEAD back to where you want to be. There may be other references ahead of that time that you would need to remove if you don’t want anything to point to the history you just deleted.
Both examples must work, but svn merge -r UPREV:LOWREV . undo range svn merge -c -REV . undoes a single revision, in your case REV would be 1944, i.e. the revision you wish to undo. in this syntax – if current dir is WC and (as in must done after every merge) you’ll commit results … Read more
There are four ways of doing so: Clean way, reverting but keep in log the revert: git revert –strategy resolve <commit> Harsh way, remove altogether only the last commit: git reset –soft “HEAD^” Note: Avoid git reset –hard as it will also discard all changes in files since the last commit. If –soft does not … Read more
git cherry-pick <original commit sha> 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 <commit sha of the revert> Either of these ways will allow you to git push without overwriting history, because it creates a new … Read more
Let’s start with a qualitative description of what we want to do (much of this is said in Ben Straub’s answer). We’ve made some number of commits, five of which changed a given file, and we want to revert the file to one of the previous versions. First of all, git doesn’t keep version numbers … Read more
To revert changes made to your working copy, do this: git checkout . Or equivalently, for git version >= 2.23: git restore . To revert changes made to the index (i.e., that you have added), do this. Warning this will reset all of your unpushed commits to master!: git reset To revert a change that … Read more