From b0149c25217dbf6600dcf5952c0b33421b020a7c Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 19 Jun 2017 21:11:09 +0100 Subject: [PATCH] Stop Git from normalising line endings Although recommended, "text" mode causes constant and unfixable conficts that I give up fighting with. (cherry picked from commit 25e445a6848a870aabd89a3b8a013265aa3cf17b) --- .gitattributes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitattributes b/.gitattributes index ae83a8942..11b61ab9d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,12 +2,6 @@ # Set the default behavior, in case people don't have core.autocrlf set. * text=auto -# Explicitly declare text files you want to always be normalized and converted -# to native line endings on checkout. -*.cpp text -*.c text -*.h text - # Declare files that will always have CRLF line endings on checkout. *.sln text eol=crlf *.vcxproj.user text eol=crlf