Git reset, as described in lots of answers ahead of, is certainly the most effective and easiest way to realize what you wish. I use it in the following workflow: Is there any approach or solution to maintain switches flat (not yaw'd) when pushing them in then screwing them down? https://luigioilseries467642.thelateblog.com/39592168/everything-about-luigi-oil-series-4