bs061414: More GIT wrangling