fixed things so that git will completely manage the working directory