{var%20f='http://v.t.sina.com.cn/share/share.php?appkey=1515056452',u=z||d.location,p=['&url=',e(u),'&title=',e(t||d.title),'&source=',e(r),'&sourceUrl=',e(l),'&content=',c||'gb2312','&pic=',e(p||'')].join('');function%20a(){if(!window.open([f,p].join(''),'mb',['toolbar=0,status=0,resizable=1,width=440,height=430,left=',(s.width-440)/2,',top=',(s.height-430)/2].join('')))u.href=[f,p].join('');};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();})(screen,document,encodeURIComponent,'','','https://www.manongdao.com/data/attach/logo/logo.png', '推荐 爷的心禁止访问 的问题《git pull always returns “not something we can merg》','https://www.manongdao.com/q-710503.html','页面编码gb2312|utf-8默认gb2312'));){kind=link}
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.