stg repair: Patchify non-patch commits between patches