Repack and recombine previous commit