Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Initialize Repository
- Loading branch information
Pustalorc
committed
Jul 7, 2020
0 parents
commit 4e00781efec5e3110364ca21527e3a94af06341b
Showing
2 changed files
with
441 additions
and
0 deletions.
There are no files selected for viewing
103
.gitattributes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
# Auto detect text files and perform LF normalization | ||
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ | ||
* text=auto | ||
|
||
*.cs diff=csharp | ||
|
||
############################################################################### | ||
# Set default behavior to automatically normalize line endings. | ||
############################################################################### | ||
* text=auto | ||
|
||
############################################################################### | ||
# 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 comment the entries below and | ||
# uncomment the group further below | ||
############################################################################### | ||
|
||
*.sln text eol=crlf | ||
*.csproj text eol=crlf | ||
*.vbproj text eol=crlf | ||
*.vcxproj text eol=crlf | ||
*.vcproj text eol=crlf | ||
*.dbproj text eol=crlf | ||
*.fsproj text eol=crlf | ||
*.lsproj text eol=crlf | ||
*.wixproj text eol=crlf | ||
*.modelproj text eol=crlf | ||
*.sqlproj text eol=crlf | ||
*.wmaproj text eol=crlf | ||
|
||
*.xproj text eol=crlf | ||
*.props text eol=crlf | ||
*.filters text eol=crlf | ||
*.vcxitems text eol=crlf | ||
|
||
|
||
#*.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 | ||
|
||
#*.xproj merge=binary | ||
#*.props merge=binary | ||
#*.filters merge=binary | ||
#*.vcxitems merge=binary | ||
|
||
#common settings that generally should always be used with your language specific settings | ||
|
||
# Auto detect text files and perform LF normalization | ||
# http://davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/ | ||
* text=auto | ||
|
||
# | ||
# The above will handle all files NOT found below | ||
# | ||
|
||
# Documents | ||
*.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 | ||
*.md text | ||
*.adoc text | ||
*.textile text | ||
*.mustache text | ||
*.csv text | ||
*.tab text | ||
*.tsv text | ||
*.sql text | ||
|
||
# Graphics | ||
*.png binary | ||
*.jpg binary | ||
*.jpeg binary | ||
*.gif binary | ||
*.tif binary | ||
*.tiff binary | ||
*.ico binary | ||
# SVG treated as an asset (binary) by default. If you want to treat it as text, | ||
# comment-out the following line and uncomment the line after. | ||
*.svg binary | ||
#*.svg text | ||
*.eps binary |
Oops, something went wrong.