cleanup and change reroll to include .git dir