Skip to content

Commit 1bd6867

Browse files
committed
Update gitattributes
1 parent c50a019 commit 1bd6867

File tree

1 file changed

+25
-59
lines changed

1 file changed

+25
-59
lines changed

.gitattributes

Lines changed: 25 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,29 @@
1-
###############################################################################
2-
# Set default behavior to automatically normalize line endings.
3-
###############################################################################
4-
* text=auto
1+
# Basic .gitattributes for a python repo.
52

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
3+
# Source files
4+
# ============
5+
*.pxd text diff=python
6+
*.py text diff=python
7+
*.py3 text diff=python
8+
*.pyw text diff=python
9+
*.pyx text diff=python
10+
*.pyz text diff=python
11+
*.pyi text diff=python
1412

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
13+
# Binary files
14+
# ============
15+
*.db binary
16+
*.p binary
17+
*.pkl binary
18+
*.pickle binary
19+
*.pyc binary export-ignore
20+
*.pyo binary export-ignore
21+
*.pyd binary
3722

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
23+
# Jupyter notebook
24+
*.ipynb text eol=lf
4625

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
26+
# Note: .db, .p, and .pkl files are associated
27+
# with the python modules ``pickle``, ``dbm.*``,
28+
# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
29+
# (among others).

0 commit comments

Comments
 (0)