Git reset, as talked about in several answers right before, is by far the most effective and easiest way to accomplish what you want. I use it in the next workflow:You'll want to merge major branch into yours (important) and then reset smooth to principal, after that all of your adjustments is going to be unstaged and you'll commit themThe correct … Read More