More git hackery