|
1 | 1 | ############################################################################### |
2 | | -# Set default behavior to automatically normalize line endings. |
| 2 | +# Set default behavior to: |
| 3 | +# automatically normalize line endings on check-in, and |
| 4 | +# convert to Windows-style line endings on check-out |
3 | 5 | ############################################################################### |
4 | 6 | * text=auto encoding=UTF-8 |
5 | | - |
6 | | -# csc/vbc are shell scripts and should always have unix line endings |
7 | | -# These shell scripts are included in the toolset packages. Normally, the shell |
8 | | -# scripts in our repo are only run by cloning onto a Linux/Mac machine, and git |
9 | | -# automatically chooses LF as the line ending. |
10 | | -# |
11 | | -# However, right now the toolset packages must be built on Windows, and so the |
12 | | -# files must be hard-coded to be cloned with LF |
13 | | -src/Compilers/CSharp/CscCore/csc text eol=lf |
14 | | -src/Compilers/VisualBasic/VbcCore/vbc text eol=lf |
| 7 | +*.sh text eol=lf |
15 | 8 |
|
16 | 9 | ############################################################################### |
17 | | -# Set default behavior for command prompt diff. |
18 | | -# |
19 | | -# This is need for earlier builds of msysgit that does not have it on by |
20 | | -# default for csharp files. |
21 | | -# Note: This is only used by command line |
| 10 | +# Set file behavior to: |
| 11 | +# treat as text, and |
| 12 | +# diff as C# source code |
22 | 13 | ############################################################################### |
23 | | -*.cs diff=csharp text |
24 | | -*.vb text |
| 14 | +*.cs text diff=csharp |
25 | 15 |
|
26 | 16 | ############################################################################### |
27 | | -# Set the merge driver for project and solution files |
28 | | -# |
29 | | -# Merging from the command prompt will add diff markers to the files if there |
30 | | -# are conflicts (Merging from VS is not affected by the settings below, in VS |
31 | | -# the diff markers are never inserted). Diff markers may cause the following |
32 | | -# file extensions to fail to load in VS. An alternative would be to treat |
33 | | -# these files as binary and thus will always conflict and require user |
34 | | -# intervention with every merge. To do so, just uncomment the entries below |
35 | | -############################################################################### |
36 | | -#*.sln merge=binary |
37 | | -#*.csproj merge=binary |
38 | | -#*.vbproj merge=binary |
39 | | -#*.vcxproj merge=binary |
40 | | -#*.vcproj merge=binary |
41 | | -#*.dbproj merge=binary |
42 | | -#*.fsproj merge=binary |
43 | | -#*.lsproj merge=binary |
44 | | -#*.wixproj merge=binary |
45 | | -#*.modelproj merge=binary |
46 | | -#*.sqlproj merge=binary |
47 | | -#*.wwaproj merge=binary |
48 | | - |
49 | | -############################################################################### |
50 | | -# behavior for image files |
51 | | -# |
52 | | -# image files are treated as binary by default. |
53 | | -############################################################################### |
54 | | -#*.jpg binary |
55 | | -#*.png binary |
56 | | -#*.gif binary |
| 17 | +# Set file behavior to: |
| 18 | +# treat as text |
| 19 | +############################################################################### |
| 20 | +*.cmd text |
| 21 | +*.config text |
| 22 | +*.csproj text |
| 23 | +*.groovy text |
| 24 | +*.json text |
| 25 | +*.md text |
| 26 | +*.nuspec text |
| 27 | +*.pkgdef text |
| 28 | +*.proj text |
| 29 | +*.projitems text |
| 30 | +*.props text |
| 31 | +*.ps1 text |
| 32 | +*.resx text |
| 33 | +*.ruleset text |
| 34 | +*.shproj text |
| 35 | +*.sln text |
| 36 | +*.targets text |
| 37 | +*.vb text |
| 38 | +*.vbproj text |
| 39 | +*.vcxproj text |
| 40 | +*.vcxproj.filters text |
| 41 | +*.vsct text |
| 42 | +*.vsixmanifest text |
57 | 43 |
|
58 | 44 | ############################################################################### |
59 | | -# diff behavior for common document formats |
60 | | -# |
61 | | -# Convert binary document formats to text before diffing them. This feature |
62 | | -# is only available from the command line. Turn it on by uncommenting the |
63 | | -# entries below. |
| 45 | +# Set file behavior to: |
| 46 | +# treat as binary |
64 | 47 | ############################################################################### |
65 | | -#*.doc diff=astextplain |
66 | | -#*.DOC diff=astextplain |
67 | | -#*.docx diff=astextplain |
68 | | -#*.DOCX diff=astextplain |
69 | | -#*.dot diff=astextplain |
70 | | -#*.DOT diff=astextplain |
71 | | -#*.pdf diff=astextplain |
72 | | -#*.PDF diff=astextplain |
73 | | -#*.rtf diff=astextplain |
74 | | -#*.RTF diff=astextplain |
| 48 | +*.png binary |
| 49 | +*.snk binary |
0 commit comments