Did you know, when using git, during an interactive rebase you can just cherry-pick any changes you want? Even from other branches. It makes total sense, but I never through of it before.