Long overdue updating git with a batch of changes