I think you accidentally changed some configuration values that were recently changed on master. If you don't want to commit all changes in a file, you could look into using `git add -p`, which lets you manually select which parts to add.