问题
No matter what repository I am in I get this response from git pull "merge: 012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012012 - not something we can merge". I have tried uninstalling git and re-installing with no luck. git fetch origin and git merge origin/master work fine. I could very well use those commands instead of git pull but Homebrew uses git pull and now it is broken too.
[UPDATE] This apparently was related to pyenv. Once I removed that from my PATH then everything went back to normal.
来源：https://stackoverflow.com/questions/25271075/git-pull-always-returns-not-something-we-can-merge