Tucked away at the end of Talking Drupal episode #122 was a mention of skip-worktree, a way to make git ignore changes in a file in a repo (that isn't in the gitignore file). One of those where's-this-been-my-whole-life things. Here's a good post about how it works.
Today I Learned
...about skip-worktree in git