Changed .gitignore to ignore all files in .settings except

for the ones that we want to preserve, to ensure a common
coding style between IDEA and Eclipse
This commit is contained in:
Clinton Gormley 2013-09-13 12:40:02 +02:00
parent d66d326ba9
commit a6fffae6df
1 changed files with 7 additions and 3 deletions

10
.gitignore vendored
View File

@ -12,8 +12,9 @@ docs/html/
docs/build.log
## eclipse ignores (use 'mvn eclipse:eclipse' to build eclipse projects)
## The only configuration files which are not ignored are .settings since
## these files ensure common coding style across Eclipse and IDEA
## The only configuration files which are not ignored are certain files in
## .settings (as listed below) since these files ensure common coding
## style across Eclipse and IDEA.
## Other files (.project, .classpath) should be generated through Maven which
## will correctly set the classpath based on the declared dependencies.
.project
@ -22,7 +23,10 @@ eclipse-build
*/.project
*/.classpath
*/eclipse-build
/.settings/org.eclipse.m2e.*
/.settings/
!/.settings/org.eclipse.core.resources.prefs
!/.settings/org.eclipse.jdt.core.prefs
!/.settings/org.eclipse.jdt.ui.prefs
## netbeans ignores
nb-configuration.xml