Remove options that are messing up git when whitespace is involved