And, if those changes are in specific commits that contain nothing else, cherry-pick / rebase* are your friend. And if you run into those merge conflicts mentioned above, git rerere is your friend ...