Updating gitconfig with master branch merge and remote