TIL that `c F' in magit allows you to add your changes to an arbitrary existing commit! 'Instant Fixup' is very useful for feature branches.