diff options
| author | Victor Hurdugaci <victor.hurdugaci@microsoft.com> | 2015-12-16 01:34:41 +0300 |
|---|---|---|
| committer | Victor Hurdugaci <victor.hurdugaci@microsoft.com> | 2015-12-16 01:34:41 +0300 |
| commit | 28474fdc757eee3f91e5051f6790ef39759ff94a (patch) | |
| tree | 763c5d74fe89f1ca0a2d235b1b5a8d84d6f2b626 | |
| parent | 3e6551f80d7c0e7e335f33511661cecd663cde2b (diff) | |
Fix line endings
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | .gitattributes~ | 69 |
2 files changed, 71 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 327262da6b..983a672a67 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,6 +7,8 @@ # Make sh files under the build directory always have LF as line endings ############################################################################### build/*.sh eol=lf +KoreBuild-dotnet/build/*.sh eol=lf +build-template-dotnet/*.sh eol=lf ############################################################################### diff --git a/.gitattributes~ b/.gitattributes~ new file mode 100644 index 0000000000..327262da6b --- /dev/null +++ b/.gitattributes~ @@ -0,0 +1,69 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Make sh files under the build directory always have LF as line endings +############################################################################### +build/*.sh eol=lf + + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# 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 +# 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 +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# 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 +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain |