more git wrangling