-
-
Notifications
You must be signed in to change notification settings - Fork 106
/
.gitattributes
132 lines (123 loc) · 3.95 KB
/
.gitattributes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto
# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.gitattributes text
*.gitignore text
*.txt text
*.ini text
*.md text diff=markdown
*.json text
*.html text diff=html
*.cshtml text diff=html
*.cs text diff=csharp
*.csx text diff=csharp
*.wxs text
*.xml text
*.py text diff=python
*.py3 text diff=python
*.gcode text
*.bt text
*.1pj text
# Declare files that will always have CRLF line endings on checkout.
*.bat text eol=crlf
*.sln text eol=crlf
*.csproj text eol=crlf
*.vbproj text eol=crlf
*.fsproj text eol=crlf
*.wixproj text eol=crlf
*.ps1 text eol=crlf
*.ps1x text eol=crlf
*.psm1 text eol=crlf
*.psd1 text eol=crlf
*.ps1xml text eol=crlf
*.pssc text eol=crlf
*.psrc text eol=crlf
*.cdxml text eol=crlf
# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf diff=bash
###############################################################################
# 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
###############################################################################
###############################################################################
# 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.
# Denote all files that are truly binary and should not be modified/mergeable.
###############################################################################
*.jpg binary
*.png binary
*.gif binary
*.bmp binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary
*.ico binary
*.icns binary
*.ai binary
# Compiled Dynamic libraries
*.so binary
*.dylib binary
*.dll binary
# Executables
*.exe binary
# Archives
*.7z binary
*.gz binary
*.jar binary
*.rar binary
*.tar binary
*.zip binary
*.sl1 binary
# 3D models
*.ipt binary
*.3mf binary
*.stl binary
# Others
*.snk 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