Fix git's latest nag
Fix git's latest nag

This is actually pretty useful, I think. The most annoying thing in git
is to pull then suddenly be making a merge commit you don't want or
need.

japanoise/neo-dotfiles,japanoise/neo-dotfiles