[hardware/bopit/.git] / .gitattributes

###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* 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

###############################################################################
# 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
Commit	Line	Data
4227424d	1	###############################################################################
	2	# Set default behavior to automatically normalize line endings.
	3	###############################################################################
	4	* text=auto
	5
	6	###############################################################################
	7	# Set default behavior for command prompt diff.
	8	#
	9	# This is need for earlier builds of msysgit that does not have it on by
	10	# default for csharp files.
	11	# Note: This is only used by command line
	12	###############################################################################
	13	#*.cs diff=csharp
	14
	15	###############################################################################
	16	# Set the merge driver for project and solution files
	17	#
	18	# Merging from the command prompt will add diff markers to the files if there
	19	# are conflicts (Merging from VS is not affected by the settings below, in VS
	20	# the diff markers are never inserted). Diff markers may cause the following
	21	# file extensions to fail to load in VS. An alternative would be to treat
	22	# these files as binary and thus will always conflict and require user
	23	# intervention with every merge. To do so, just uncomment the entries below
	24	###############################################################################
	25	#*.sln merge=binary
	26	#*.csproj merge=binary
	27	#*.vbproj merge=binary
	28	#*.vcxproj merge=binary
	29	#*.vcproj merge=binary
	30	#*.dbproj merge=binary
	31	#*.fsproj merge=binary
	32	#*.lsproj merge=binary
	33	#*.wixproj merge=binary
	34	#*.modelproj merge=binary
	35	#*.sqlproj merge=binary
	36	#*.wwaproj merge=binary
	37
	38	###############################################################################
	39	# behavior for image files
	40	#
	41	# image files are treated as binary by default.
	42	###############################################################################
	43	#*.jpg binary
	44	#*.png binary
	45	#*.gif binary
	46
	47	###############################################################################
	48	# diff behavior for common document formats
	49	#
	50	# Convert binary document formats to text before diffing them. This feature
	51	# is only available from the command line. Turn it on by uncommenting the
	52	# entries below.
	53	###############################################################################
	54	#*.doc diff=astextplain
	55	#*.DOC diff=astextplain
	56	#*.docx diff=astextplain
	57	#*.DOCX diff=astextplain
	58	#*.dot diff=astextplain
	59	#*.DOT diff=astextplain
	60	#*.pdf diff=astextplain
	61	#*.PDF diff=astextplain
	62	#*.rtf diff=astextplain
	63	#*.RTF diff=astextplain