Update git-related settings
Merge changes from origin