We have all been there before: you’re working on a big feature branch, committing all over the place and then at some point you need to extract something out to merge it back to the main (or develop) branch. My usual to method is to split off a new branch and then use git rebase to keep only the commits of the parts that I want to extract out and merge that back after which I then rebase my feature branch on the target branch again.
But what if you find that some commit halfway through the changeset needs to be split up? That’s what I will be diving into in this article.
Continue reading “Splitting commits using git rebase”