Completing the functionality to allow for local configuration to be retained during a git pull