1
0
mirror of https://github.com/gitattributes/gitattributes.git synced 2025-01-22 00:08:52 -05:00

Add F# and tweak C# (#128)

Co-authored-by: Richie Bendall <richiebendall@gmail.com>
This commit is contained in:
Houston Haynes 2021-03-09 22:41:29 -08:00 committed by GitHub
parent 27ab17bf9c
commit dcf1bcdba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
*~ *~
.vscode

View File

@ -1,5 +1,8 @@
# Auto detect text files and perform LF normalization # Auto detect text files and perform LF normalization
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ * text=auto
* text=auto
*.cs text diff=csharp *.cs text diff=csharp
*.cshtml text diff=html
*.csx text diff=csharp
*.sln text eol=crlf merge=union
*.csproj text merge=union

7
FSharp.gitattributes Normal file
View File

@ -0,0 +1,7 @@
# Auto detect text files and perform LF normalization
* text=auto
*.fs text diff=fsharp
*.fsx text diff=fsharp
*.sln text eol=crlf merge=union
*.fsproj text merge=union