Re #6096. Remove 'personal' .gitignore entries

These should go in .git/info/exclude instead.
mantidproject · Dec 7, 2012 · 21d7c71 · 21d7c71
1 parent ec800e1
commit 21d7c71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,9 @@
 # Took these from the https://github.com/github/gitignore project on October 21, 2011
 
+# **** 'Personal' entries don't belong in here - put them in your .git/info/exclude file ****
+
 # Ignore text editor (e.g. emacs) autosave files
 *~
-# ignore internal gitignore
-*/test/.gitignore
-/Code/Mantid/*/*/test/.gitignore
-Win64/
 
 # Ignore CMake generated files (if someone does an in-source build)
 CMakeCache.txt
@@ -48,8 +46,6 @@ local.properties
 .classpath
 .settings/
 .loadpath
-*.vcxproj
-*.filters
 
 # External tool builders
 .externalToolBuilders/
@@ -68,6 +64,8 @@ local.properties
 *.sln
 *.vcproj
 *.exe
+*.vcxproj
+*.filters
 
 # User-specific files
 *.suo

diff --git a/Code/.gitignore b/Code/.gitignore
@@ -4,5 +4,4 @@ Third_Party/
 win64/
 dbg/
 rel/
-debug/
-release/
+
diff --git a/Code/Mantid/Framework/Algorithms/test/.gitignore b/Code/Mantid/Framework/Algorithms/test/.gitignore
@@ -1,8 +1,5 @@
-*.cpp
-test_header.h 
 DivideTest.h
 MinusTest.h
 MultiplyTest.h
 PlusTest.h
-/*.properties
-/test_header.h
+