Spaces:
Sleeping
Sleeping
Commit
·
2282c97
1
Parent(s):
1ce1efc
[Added] nbdev hooks
Browse files- .gitattributes +1 -0
- .gitconfig +11 -0
.gitattributes
CHANGED
|
@@ -39,3 +39,4 @@ Images/** filter=lfs diff=lfs merge=lfs -text
|
|
| 39 |
Images/* filter=lfs diff=lfs merge=lfs -text
|
| 40 |
Images/ filter=lfs diff=lfs merge=lfs -text
|
| 41 |
Images/** filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
| 39 |
Images/* filter=lfs diff=lfs merge=lfs -text
|
| 40 |
Images/ filter=lfs diff=lfs merge=lfs -text
|
| 41 |
Images/** filter=lfs diff=lfs merge=lfs -text
|
| 42 |
+
*.ipynb merge=nbdev-merge
|
.gitconfig
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
# Generated by nbdev_install_hooks
|
| 2 |
+
#
|
| 3 |
+
# If you need to disable this instrumentation do:
|
| 4 |
+
# git config --local --unset include.path
|
| 5 |
+
#
|
| 6 |
+
# To restore:
|
| 7 |
+
# git config --local include.path ../.gitconfig
|
| 8 |
+
#
|
| 9 |
+
[merge "nbdev-merge"]
|
| 10 |
+
name = resolve conflicts with nbdev_fix
|
| 11 |
+
driver = nbdev_merge %O %A %B %P
|