git clean and restore directories
stash appropriately