The .gitattributes should normally override this setting. Are you possibly using an old version of git?