Comment by o11c

Adding fixup commits (specifying the specific commit they will be squashed into), to be squashed by the bot before merge, handles that.