git.r.bdr.sh - rbdr/super-polarity/blame_incremental

... / ...

Commit	Line	Data
	1	<<<<<<< HEAD
	2	# Object files
	3	*.o
	4
	5	# Libraries
	6	*.lib
	7	*.a
	8
	9	# Shared objects (inc. Windows DLLs)
	10	*.dll
	11	*.so
	12	.so.
	13	*.dylib
	14
	15	# Executables
	16	*.exe
	17	*.out
	18	*.app
	19	=======
	20	## Ignore Visual Studio temporary files, build results, and
	21	## files generated by popular Visual Studio add-ons.
	22
	23	# User-specific files
	24	*.suo
	25	*.user
	26	*.sln.docstates
	27
	28	# Build results
	29
	30	[Dd]ebug/
	31	[Rr]elease/
	32	x64/
	33	build/
	34	[Bb]in/
	35	[Oo]bj/
	36
	37	# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
	38	!packages/*/build/
	39
	40	# MSTest test Results
	41	[Tt]est[Rr]esult*/
	42	[Bb]uild[Ll]og.*
	43
	44	*_i.c
	45	*_p.c
	46	*.ilk
	47	*.meta
	48	*.obj
	49	*.pch
	50	*.pdb
	51	*.pgc
	52	*.pgd
	53	*.rsp
	54	*.sbr
	55	*.tlb
	56	*.tli
	57	*.tlh
	58	*.tmp
	59	*.tmp_proj
	60	*.log
	61	*.vspscc
	62	*.vssscc
	63	.builds
	64	*.pidb
	65	*.log
	66	*.scc
	67
	68	# Visual C++ cache files
	69	ipch/
	70	*.aps
	71	*.ncb
	72	*.opensdf
	73	*.sdf
	74	*.cachefile
	75
	76	# Visual Studio profiler
	77	*.psess
	78	*.vsp
	79	*.vspx
	80
	81	# Guidance Automation Toolkit
	82	*.gpState
	83
	84	# ReSharper is a .NET coding add-in
	85	_ReSharper*/
	86	*.[Rr]e[Ss]harper
	87
	88	# TeamCity is a build add-in
	89	_TeamCity*
	90
	91	# DotCover is a Code Coverage Tool
	92	*.dotCover
	93
	94	# NCrunch
	95	.ncrunch
	96	.crunch.local.xml
	97
	98	# Installshield output folder
	99	[Ee]xpress/
	100
	101	# DocProject is a documentation generator add-in
	102	DocProject/buildhelp/
	103	DocProject/Help/*.HxT
	104	DocProject/Help/*.HxC
	105	DocProject/Help/*.hhc
	106	DocProject/Help/*.hhk
	107	DocProject/Help/*.hhp
	108	DocProject/Help/Html2
	109	DocProject/Help/html
	110
	111	# Click-Once directory
	112	publish/
	113
	114	# Publish Web Output
	115	*.Publish.xml
	116	*.pubxml
	117
	118	# NuGet Packages Directory
	119	## TODO: If you have NuGet Package Restore enabled, uncomment the next line
	120	#packages/
	121
	122	# Windows Azure Build Output
	123	csx
	124	*.build.csdef
	125
	126	# Windows Store app package directory
	127	AppPackages/
	128
	129	# Others
	130	sql/
	131	*.Cache
	132	ClientBin/
	133	[Ss]tyle[Cc]op.*
	134	~$*
	135	*~
	136	*.dbmdl
	137	*.[Pp]ublish.xml
	138	*.pfx
	139	*.publishsettings
	140
	141	# RIA/Silverlight projects
	142	Generated_Code/
	143
	144	# Backup & report files from converting an old project file to a newer
	145	# Visual Studio version. Backup files are not needed, because we have git ;-)
	146	_UpgradeReport_Files/
	147	Backup*/
	148	UpgradeLog*.XML
	149	UpgradeLog*.htm
	150
	151	# SQL Server files
	152	App_Data/*.mdf
	153	App_Data/*.ldf
	154
	155	# =========================
	156	# Windows detritus
	157	# =========================
	158
	159	# Windows image file caches
	160	Thumbs.db
	161	ehthumbs.db
	162
	163	# Folder config file
	164	Desktop.ini
	165
	166	# Recycle Bin used on file shares
	167	$RECYCLE.BIN/
	168
	169	# Mac crap
	170	.DS_Store
	171	>>>>>>> bca44639c27169b0643de1b56361e6c2958d1d4a