Updating .gitattributes to be explicit about which extensions are tex…

…t vs binary and which must have crlf (sln) vs lf (sh)
dotnet · Nov 3, 2017 · 04c8a12 · 04c8a12
1 parent d09abd3
commit 04c8a12
Showing 1 changed file with 36 additions and 52 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,65 +1,49 @@
 ###############################################################################
-# Set default behavior to automatically normalize line endings.
+# Set default behavior to:
+#   automatically normalize line endings on check-in
 ###############################################################################
-* text=auto encoding=UTF-8
-*.vb linguist-vendored
+*           text=auto
 
 ###############################################################################
-# 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 text 
-*.vb     text
+# Set file behavior to:
+#   treat as text
+###############################################################################
+*.cmd       text
+*.config    text
+*.cs        text
+*.csproj    text
+*.groovy    text
+*.json      text
+*.md        text
+*.proj      text
+*.projitems text
+*.props     text
+*.ps1       text
+*.resx      text
+*.shproj    text
+*.sln       text
+*.targets   text
+*.txt       text
+*.xlf       text
+*.xml       text
+
 
 ###############################################################################
-# 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
+# Set file behavior to:
+#   treat as text
+#   normalize to Windows-style line endings on check-in
 ###############################################################################
-#*.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
+*.sln        text       eol=crlf
 
 ###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
+# Set file behavior to:
+#   treat as text
+#   normalize to Unix-style line endings on check-in
 ###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
+*.sh        text        eol=lf
 
 ###############################################################################
-# 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.
+# Set file behavior to:
+#   treat as binary
 ###############################################################################
-#*.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
+*.snk       binary