Reset git diff settings for color and mnemonicprefix to default

[gsamokovarov]

This is m4i#32 rebased for the NickLaMuro/all_the_features branch. I'd prefer if we eventually merge the whole all_the_features branch into master and go from there, should we need to apply other patches to our own fork.

I have run into this problem while trying to commit only Gemfile and Gemfile.lock changes. Follow the issue and the test to gain more context.

Pinging @skanev.

[NickLaMuro]

@gsamokovarov Sorry, you caught me on my PTO, and I didn't get a chance to look at this until today.

I want to say it has been almost 2 years since I have touched this branch so I really have to get back up to speed on everything I have done in this branch. I never really intended this to be a proper fork of the gem, but to be fair, I have basically been running this from my branch for a while now.

That said, your change seems to make sense based on the related links, so I will probably get this merged in a bit when I just understand myself what this change does. Might re-work this branch if I get the time as well, but since I have at least 1 user making use of this, I probably should pay a bit more attention. 😄

[gsamokovarov]

@NickLaMuro, oh I was thinking that I made the PR in our fork. 😅 But please do fix it when you see fit! 🙏 We are using it and we are running into this when people setup themselves and have incompatible configs.

[NickLaMuro]

@gsamokovarov sorry for taking so long to get to merging this, but this seems totally reasonable to me now that I have taken a second to see what the issue was originally, and how this is different from master.

Thanks for this! Merging...