Update gitconfig and remove unused options