diff --git a/.gitattributes b/.gitattributes index bbe6246..7ff73f4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ +# Auto detect text files +* text=auto # Custom for Visual Studio *.cs diff=csharp text=auto eol=lf @@ -10,7 +12,6 @@ *.vbproj merge=union *.fsproj merge=union *.dbproj merge=union -*.sh text eol=lf # Standard to msysgit *.doc diff=astextplain diff --git a/.gitignore b/.gitignore index f4fc55c..f46383d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,3 @@ -# ---> C Sharp -# Build Folders (you can keep bin if you'd like, to store dlls and pdbs) -[Bb]in/ -[Oo]bj/ - -# mstest test results -TestResults - ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. @@ -20,6 +12,7 @@ TestResults *.exe.mdb # Build results + [Dd]ebug/ [Rr]elease/ x64/ @@ -107,13 +100,8 @@ publish/ # Publish Web Output *.Publish.xml -# NuGet Packages Directory -packages # Enable nuget.exe in the .nuget folder (though normally executables are not tracked) !.nuget/NuGet.exe -# Packet lock file -paket.lock -.paket/paket.exe # Windows Azure Build Output csx @@ -126,11 +114,7 @@ AppPackages/ .vscode/ # Others -[Bb]in -[Oo]bj sql/ -TestResults -[Tt]est[Rr]esult* *.Cache ClientBin/ [Ss]tyle[Cc]op.* @@ -140,6 +124,7 @@ ClientBin/ *.[Pp]ublish.xml *.pfx *.publishsettings + # RIA/Silverlight projects Generated_Code/ @@ -150,8 +135,6 @@ Backup*/ UpgradeLog*.XML UpgradeLog*.htm -# Default archive directory -archive # SQL Server files App_Data/*.mdf App_Data/*.ldf @@ -193,16 +176,17 @@ TestResults.xml nuget/*.nupkg release.cmd release.sh -docs localpackages/ paket-files *.orig -.paket/paket.exe docsrc/content/license.md docsrc/content/release-notes.md .fake docsrc/tools/FSharp.Formatting.svclog +# misc paket files +.paket/paket.exe +paket.lock -# local resources -src/resources/extensions-schema.sqlite +# docs +docs