more trial and error with git