2014-01-29 10:50:42 +04:00
|
|
|
###############################################################################
|
|
|
|
# Set default behavior to automatically normalize line endings.
|
|
|
|
###############################################################################
|
|
|
|
* text=auto
|
|
|
|
|
2014-09-22 04:52:28 +04:00
|
|
|
###############################################################################
|
|
|
|
# Make sh files under the build directory always have LF as line endings
|
|
|
|
###############################################################################
|
2015-12-16 01:44:00 +03:00
|
|
|
*.sh eol=lf
|
2014-09-22 04:52:28 +04:00
|
|
|
|
2020-02-20 00:18:12 +03:00
|
|
|
###############################################################################
|
|
|
|
# Make gradlew always have LF as line endings
|
|
|
|
###############################################################################
|
|
|
|
gradlew eol=lf
|
|
|
|
|
2014-01-29 10:50:42 +04:00
|
|
|
###############################################################################
|
|
|
|
# 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
|
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
# 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
|
2018-11-27 14:29:12 +03:00
|
|
|
# the diff markers are never inserted). Diff markers may cause the following
|
2014-01-29 10:50:42 +04:00
|
|
|
# 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
|
2018-11-27 14:29:12 +03:00
|
|
|
#
|
2014-01-29 10:50:42 +04:00
|
|
|
# Convert binary document formats to text before diffing them. This feature
|
2018-11-27 14:29:12 +03:00
|
|
|
# is only available from the command line. Turn it on by uncommenting the
|
2014-01-29 10:50:42 +04:00
|
|
|
# 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
|
2020-06-17 16:17:29 +03:00
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
# Make sure jQuery files always have LF as line endings (to pass SRI checks)
|
|
|
|
###############################################################################
|
|
|
|
jquery*.js eol=lf
|
|
|
|
jquery*.map eol=lf
|
2021-09-03 06:01:49 +03:00
|
|
|
|
|
|
|
###############################################################################
|
|
|
|
# Make sure bootstrap files always have LF as line endings (to pass SRI checks)
|
|
|
|
###############################################################################
|
|
|
|
bootstrap*.js eol=lf
|
|
|
|
bootstrap*.map eol=lf
|
|
|
|
bootstrap*.css eol=lf
|