-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Using the same .gitattrbutes as dotnet/aspire
- Loading branch information
1 parent
d8f4094
commit 7d7d34d
Showing
1 changed file
with
51 additions
and
61 deletions.
There are no files selected for viewing
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 |
---|---|---|
@@ -1,70 +1,60 @@ | ||
############################################################################### | ||
# Set default behavior to automatically normalize line endings. | ||
############################################################################### | ||
* text=auto | ||
|
||
############################################################################### | ||
# Set default behavior for command prompt diff. | ||
# | ||
# This is need for earlier builds of msysgit that does not have it on by | ||
# default for csharp files. | ||
# Note: This is only used by command line | ||
############################################################################### | ||
*.cs diff=csharp | ||
# Collapse these files in PRs by default | ||
*.xlf linguist-generated=true | ||
*.lcl linguist-generated=true | ||
|
||
############################################################################### | ||
# 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 uncomment the entries below | ||
############################################################################### | ||
#*.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 | ||
|
||
############################################################################### | ||
# behavior for image files | ||
# | ||
# image files are treated as binary by default. | ||
############################################################################### | ||
#*.jpg binary | ||
#*.png binary | ||
#*.gif binary | ||
|
||
############################################################################### | ||
# diff behavior for common document formats | ||
# | ||
# Convert binary document formats to text before diffing them. This feature | ||
# is only available from the command line. Turn it on by uncommenting the | ||
# entries below. | ||
############################################################################### | ||
#*.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 | ||
*.jpg binary | ||
*.png binary | ||
*.gif binary | ||
|
||
# Force bash scripts to always use lf line endings so that if a repo is accessed | ||
# in Unix via a file share from Windows, the scripts will work. | ||
*.in text eol=lf | ||
*.sh text eol=lf | ||
|
||
# Force the docs to always use lf line endings | ||
docs/**/*.xml text eol=lf | ||
# Likewise, force cmd and batch scripts to always use crlf | ||
*.cmd text eol=crlf | ||
*.bat text eol=crlf | ||
|
||
*.cs text=auto diff=csharp | ||
*.vb text=auto | ||
*.resx text=auto | ||
*.c text=auto | ||
*.cpp text=auto | ||
*.cxx text=auto | ||
*.h text=auto | ||
*.hxx text=auto | ||
*.py text=auto | ||
*.rb text=auto | ||
*.java text=auto | ||
*.html text=auto | ||
*.htm text=auto | ||
*.css text=auto | ||
*.scss text=auto | ||
*.sass text=auto | ||
*.less text=auto | ||
*.js text=auto | ||
*.lisp text=auto | ||
*.clj text=auto | ||
*.sql text=auto | ||
*.php text=auto | ||
*.lua text=auto | ||
*.m text=auto | ||
*.asm text=auto | ||
*.erl text=auto | ||
*.fs text=auto | ||
*.fsx text=auto | ||
*.hs text=auto | ||
|
||
*.csproj text=auto | ||
*.vbproj text=auto | ||
*.fsproj text=auto | ||
*.dbproj text=auto | ||
*.sln text=auto eol=crlf | ||
|
||
# Set linguist language for .h files explicitly based on | ||
# https://github.com/github/linguist/issues/1626#issuecomment-401442069 | ||
# this only affects the repo's language statistics | ||
*.h linguist-language=C |