Rewrite the commit handling to brave new Git world