summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2014-10-21 10:17:11 -0700
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-10-21 10:18:18 -0700
commitce980cea21096f9961f2021b2992f2a46e93e552 (patch)
tree4db0843ab3a0ba1932f055a4b55a4b4e0fe99940
parentab94bea9ab54c1fea8c6d45d260c5973a388d745 (diff)
downloadcaffeonacl-ce980cea21096f9961f2021b2992f2a46e93e552.tar.gz
caffeonacl-ce980cea21096f9961f2021b2992f2a46e93e552.tar.bz2
caffeonacl-ce980cea21096f9961f2021b2992f2a46e93e552.zip
groom ignore
- re-group general and Caffe ignores - ignore OS X files and Eclipse .settings as suggested by @cypof
-rw-r--r--.gitignore56
1 files changed, 30 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index fa279f90..c27c7a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,21 +26,26 @@
# Compiled MATLAB
*.mex*
-# build, distribute, and bins
-build
-.build_debug/*
-.build_release/*
-distribute/*
-*.testbin
-*.bin
-python/caffe/proto/
+# IPython notebook checkpoints
+.ipynb_checkpoints
+
+# CMake generated files
+*.gen.cmake
# Editor temporaries
*.swp
*~
-# IPython notebook checkpoints
-.ipynb_checkpoints
+# Sublime Text settings
+*.sublime-workspace
+*.sublime-project
+
+# Eclipse Project settings
+*.*project
+.settings
+
+# OSX dir files
+.DS_Store
## Caffe
@@ -58,13 +63,14 @@ models/*
*leveldb
*lmdb
-# LevelDB files
-*.sst
-*.ldb
-LOCK
-LOG*
-CURRENT
-MANIFEST-*
+# build, distribute, and bins (+ python proto bindings)
+build
+.build_debug/*
+.build_release/*
+distribute/*
+*.testbin
+*.bin
+python/caffe/proto/
# Generated documentation
docs/_site
@@ -73,12 +79,10 @@ _site
doxygen
docs/dev
-# Sublime Text settings
-*.sublime-workspace
-*.sublime-project
-
-# Eclipse Project settings
-*.*project
-
-# CMake generated files
-*.gen.cmake
+# LevelDB files
+*.sst
+*.ldb
+LOCK
+LOG*
+CURRENT
+MANIFEST-*