Git reset, as stated in many solutions prior to, is by far the ideal and most straightforward way to achieve what you want. I utilize it in the next workflow: I discovered Felix Rieseberg's Option to be the very best. This really is my somewhat shorter transcription of his suggestions: https://bigchiefduoallinoneliquid80112.ja-blog.com/39812410/the-basic-principles-of-duo-liquid-diamonds