I use spr and git fixup for this workflow and it's really helped me breakup my changes better, managing multiple branches and stacking changes that way is a huge pain, but this workflow has been huge for me!

SPR: https://github.com/getcord/spr

Git fixup: https://github.com/keis/git-fixup