trying to get git to do what I want