Git reset, as stated in lots of answers right before, is certainly the very best and simplest way to achieve what you want. I utilize it in the subsequent workflow: I discovered Felix Rieseberg's solution to become the most beneficial. This can be my marginally shorter transcription of his advice: https://caidenlygko.tribunablog.com/top-latest-five-big-chief-duo-all-in-one-liquid-diamonds-urban-news-53870977