In my use case (developing using an edited config file on my personal machine, running on another machine with the unchanged config), this was the solution for me:
start ignoring changes to a file:
git update-index --assume-unchanged path/to/file
keep tracking again:
git update-index --no-assume-unchanged path/to/file