|
| 1 | +############################################################################### |
| 2 | +# Set default behavior to automatically normalize line endings. |
| 3 | +############################################################################### |
| 4 | +* text=auto |
| 5 | + |
| 6 | +############################################################################### |
| 7 | +# Adjust your .gitattributes file to treat ClickOnce files as non-text |
| 8 | +############################################################################### |
| 9 | +*.manifest binary |
| 10 | +*.application binary |
| 11 | +*.deploy binary |
| 12 | +#*.config binary |
| 13 | +#*.vsto binary |
| 14 | + |
| 15 | +############################################################################### |
| 16 | +# Explicitly declare text files you want to always be normalized and converted |
| 17 | +# to native line endings on checkout. |
| 18 | +############################################################################### |
| 19 | +#*.config text |
| 20 | +#*.config.deploy text |
| 21 | + |
| 22 | +############################################################################### |
| 23 | +# Declare files that will always have CRLF line endings on checkout. |
| 24 | +############################################################################### |
| 25 | +*.sln text eol=crlf |
| 26 | + |
| 27 | +############################################################################### |
| 28 | +# Set default behavior for command prompt diff. |
| 29 | +# |
| 30 | +# This is need for earlier builds of msysgit that does not have it on by |
| 31 | +# default for csharp files. |
| 32 | +# Note: This is only used by command line |
| 33 | +############################################################################### |
| 34 | +#*.cs diff=csharp |
| 35 | + |
| 36 | +############################################################################### |
| 37 | +# Set the merge driver for project and solution files |
| 38 | +# |
| 39 | +# Merging from the command prompt will add diff markers to the files if there |
| 40 | +# are conflicts (Merging from VS is not affected by the settings below, in VS |
| 41 | +# the diff markers are never inserted). Diff markers may cause the following |
| 42 | +# file extensions to fail to load in VS. An alternative would be to treat |
| 43 | +# these files as binary and thus will always conflict and require user |
| 44 | +# intervention with every merge. To do so, just uncomment the entries below |
| 45 | +############################################################################### |
| 46 | +#*.sln merge=binary |
| 47 | +#*.csproj merge=binary |
| 48 | +#*.vbproj merge=binary |
| 49 | +#*.vcxproj merge=binary |
| 50 | +#*.vcproj merge=binary |
| 51 | +#*.dbproj merge=binary |
| 52 | +#*.fsproj merge=binary |
| 53 | +#*.lsproj merge=binary |
| 54 | +#*.wixproj merge=binary |
| 55 | +#*.modelproj merge=binary |
| 56 | +#*.sqlproj merge=binary |
| 57 | +#*.wwaproj merge=binary |
| 58 | + |
| 59 | +############################################################################### |
| 60 | +# behavior for image files |
| 61 | +# |
| 62 | +# image files are treated as binary by default. |
| 63 | +############################################################################### |
| 64 | +#*.jpg binary |
| 65 | +#*.png binary |
| 66 | +#*.gif binary |
| 67 | + |
| 68 | +############################################################################### |
| 69 | +# diff behavior for common document formats |
| 70 | +# |
| 71 | +# Convert binary document formats to text before diffing them. This feature |
| 72 | +# is only available from the command line. Turn it on by uncommenting the |
| 73 | +# entries below. |
| 74 | +############################################################################### |
| 75 | +#*.doc diff=astextplain |
| 76 | +#*.DOC diff=astextplain |
| 77 | +#*.docx diff=astextplain |
| 78 | +#*.DOCX diff=astextplain |
| 79 | +#*.dot diff=astextplain |
| 80 | +#*.DOT diff=astextplain |
| 81 | +#*.pdf diff=astextplain |
| 82 | +#*.PDF diff=astextplain |
| 83 | +#*.rtf diff=astextplain |
| 84 | +#*.RTF diff=astextplain |
0 commit comments