diff options
author | Chris Wilson <chris+github@qwirx.com> | 2017-06-19 21:11:09 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2017-06-22 20:26:44 +0100 |
commit | 25e445a6848a870aabd89a3b8a013265aa3cf17b (patch) | |
tree | 6760745768441d88c9ada66d5ad7d46688bad540 /.gitattributes | |
parent | 3a3fc72cd3b3c98870028f6d968b9cde64341ccd (diff) |
Stop Git from normalising line endings
Although recommended, "text" mode causes constant and unfixable conficts
that I give up fighting with.
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/.gitattributes b/.gitattributes index ae83a894..11b61ab9 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 |