Continued adventures in Git