My scenario is that I have one branch in which I\'ve made big improvements to the build process (branch A) and in another I\'m working on a unrelated feature (branch B). So
You should be able to cherry-pick the commits (with -n to avoid committing right away).
-n