Skip to content

Commit

Permalink
Merge pull request wmjordan#29 from calcitem/gitattr
Browse files Browse the repository at this point in the history
完善 .gitattributes
  • Loading branch information
wmjordan authored Jan 8, 2022
2 parents f1ff041 + fb7a660 commit fca5096
Showing 1 changed file with 24 additions and 9 deletions.
33 changes: 24 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
###############################################################################
* text=auto

# Make sure that these files always have CRLF line endings in checkout
*.config text eol=crlf
*.cs text eol=crlf
*.csproj text eol=crlf
*.html text eol=crlf
*.js text eol=crlf
*.manifest text eol=crlf
*.resx text eol=crlf
*.sln text eol=crlf
*.targets text eol=crlf
*.txt text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.xml text eol=crlf
*.xsd text eol=crlf

# Never perform LF normalization on these files
*.chw binary
*.dll binary
*.docx binary
*.exe binary
*.ico binary
*.png binary

###############################################################################
# Set default behavior for command prompt diff.
#
Expand Down Expand Up @@ -35,15 +59,6 @@
#*.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
#
Expand Down

0 comments on commit fca5096

Please sign in to comment.