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 commit after the revert.When … Read more
There are multiple problems the can cause this behaviour: Line ending normalization I’ve had these kinds of problems too. It comes down to git automatically converting crlf to lf. This is typically caused by mixed line endings in a single file. The file gets normalized in the index, but when git then denormalizes it again … Read more
If you want to revert changes made to your working copy, do this: If you want 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!: If you want to revert a change that you have committed, do this: If you … Read more
If you want to revert changes made to your working copy, do this: If you want 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!: If you want to revert a change that you have committed, do this: If you … Read more