[git-users] git diff shows some cpp file as binary and core.attributesfile has no effect

using no attributes at all, here's part of the output of log --decorate=short --source --graph --pretty=oneline --stat: * 1f0a8441a99478a62fc71d29373ae3f3ad217862 HEAD commitmessage | somefile.cpp | Bin 577366 - 578276 bytes | otherfile.cpp

[git-users] Something wrong after simple merge

Hi, folks. I am developing a website using Wordpress and a bunch of plugins. I have two local branches master and layers. Master is my public release, that I upload to my servers and that goes live to the internet. Layers is a development branch, that I merge to Master when I reach some