summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schwarz <michi.schwarz@gmail.com>2015-03-14 15:10:13 +0100
committerMichael Schwarz <michi.schwarz@gmail.com>2015-03-14 16:26:44 +0100
commite03689f0ffab49baea0d0ebd667ae8a9438dfa3f (patch)
treedef09c976795820475920aa25874d117e766e036
parent7e904b6055c8a249c54d53f3ede6addb9711ee62 (diff)
downloadpogojig-e03689f0ffab49baea0d0ebd667ae8a9438dfa3f.tar.gz
pogojig-e03689f0ffab49baea0d0ebd667ae8a9438dfa3f.tar.bz2
pogojig-e03689f0ffab49baea0d0ebd667ae8a9438dfa3f.zip
Moved .gitignore rules to top level.
This moves all ignore rules to the .gitignore files in the root directory. This is so that users can edit the .gitignore file in src without the risk of merge conflicts if we ever need to edit the default rules. src/.gitignore is now empty but is left in the repository so that the src directory is automatically created on checkout.
-rw-r--r--.gitignore6
-rw-r--r--src/.gitignore6
2 files changed, 5 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index b01f4b8..6911073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
/config.mk
-*.pyc
+/support/**/*.pyc
+
+/src/**/*.dxf
+/src/**/*.stl
+/src/**/*.d
diff --git a/src/.gitignore b/src/.gitignore
index 893598b..e69de29 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +0,0 @@
-*.dxf
-*.stl
-*.d
-
-# Generated files
-/generated/