commit before rewrite
Rewrite patch format