X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.gitattributes;h=8a978532cf7db9e0942234538613120bf127acd9;hb=refs%2Fheads%2Faccepted%2Ftizen_unified_dev;hp=1ff0c423042b46cb1d617b81efb715defbe8054d;hpb=6b8c1541022b30f1c234de35d6755561b03cfb0c;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

diff --git a/.gitattributes b/.gitattributes
index 1ff0c42..8a97853 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,63 +1,14 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
+# Set default behaviour, in case users don't have core.autocrlf set.
 * 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
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.cs 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
-###############################################################################
-#*.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
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
 
-###############################################################################
-# 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
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.jpeg binary