Skip to content
This repository was archived by the owner on May 29, 2025. It is now read-only.

Commit 050376c

Browse files
committed
VS recommended changes for using git, I guess
1 parent ffa6da9 commit 050376c

File tree

2 files changed

+87
-0
lines changed

2 files changed

+87
-0
lines changed

.gitattributes

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

.gitignore

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,27 @@ Debug/
4444
Release/
4545
*DoNotShip/
4646
ipch/
47+
48+
# Recommended changes for working with nuget packages
49+
50+
# Ignore NuGet Packages
51+
*.nupkg
52+
53+
# The packages folder can be ignored because of Package Restore
54+
**/[Pp]ackages/*
55+
56+
# except build/, which is used as an MSBuild target.
57+
!**/[Pp]ackages/build/
58+
59+
# Uncomment if necessary however generally it will be regenerated when needed
60+
#!**/[Pp]ackages/repositories.config
61+
62+
# NuGet v3's project.json files produces more ignorable files
63+
*.nuget.props
64+
*.nuget.targets
65+
66+
# Ignore other intermediate files that NuGet might create. project.lock.json is used in conjunction
67+
# with project.json (NuGet v3); project.assets.json is used in conjunction with the PackageReference
68+
# format (NuGet v4 and .NET Core).
69+
project.lock.json
70+
project.assets.json

0 commit comments

Comments
 (0)