Continuing to fight with Git...