Skip to content

Commit

Permalink
Merge pull request oshi#1079 from hazendaz/wip
Browse files Browse the repository at this point in the history
[git] Add gitattributes file
  • Loading branch information
hazendaz authored Jan 5, 2020
2 parents 8c162ae + 58599cb commit 062e772
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union

# Standard to msysgit
*.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

0 comments on commit 062e772

Please sign in to comment.