trying  to Git to behave nicely yet again