diff options
| author | TrueKuehli <rctcoaster2000@hotmail.de> | 2018-10-01 13:55:38 +0200 |
|---|---|---|
| committer | TrueKuehli <rctcoaster2000@hotmail.de> | 2018-10-01 13:55:38 +0200 |
| commit | 7827f910ca95ab0b797e3293bf929ab6834bc463 (patch) | |
| tree | 9eafe70cfc551ceb46b16f51fe54e9cfaf3fccce /.gitattributes | |
| parent | 4ddde4c2e793c7d4cc240c90d5fcb0bc1ddf7a4b (diff) | |
Fixed gitattributes
Thank me later
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 1ff0c42..d830d39 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,6 +2,7 @@ # Set default behavior to automatically normalize line endings. ############################################################################### * text=auto +* text eol=lf ############################################################################### # Set default behavior for command prompt diff. @@ -17,7 +18,7 @@ # # Merging from the command prompt will add diff markers to the files if there # are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following +# the diff markers are never inserted). Diff markers may cause the following # file extensions to fail to load in VS. An alternative would be to treat # these files as binary and thus will always conflict and require user # intervention with every merge. To do so, just uncomment the entries below @@ -46,9 +47,9 @@ ############################################################################### # diff behavior for common document formats -# +# # Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the +# is only available from the command line. Turn it on by uncommenting the # entries below. ############################################################################### #*.doc diff=astextplain |