Skip to content

Commit

Permalink
Stop Git from normalising line endings
Browse files Browse the repository at this point in the history
Although recommended, "text" mode causes constant and unfixable conficts
that I give up fighting with.
  • Loading branch information
qris committed Jun 19, 2017
1 parent 0b03d6c commit f95d390
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions .gitattributes
Expand Up @@ -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
Expand Down

0 comments on commit f95d390

Please sign in to comment.