Git reset, as stated in lots of answers right before, is definitely the most effective and simplest way to accomplish what you would like. I utilize it in the next workflow:You need to merge primary branch into yours (important) and after that reset gentle to principal, after that all your changes will probably be unstaged and you can dedicate them