diff options
| -rw-r--r-- | .gitignore | 42 | ||||
| -rw-r--r-- | gitignore.SAMPLE | 28 | ||||
| -rw-r--r-- | lib/.gitignore | 15 | ||||
| -rw-r--r-- | test/files/.gitignore (renamed from test/files/gitignore.SAMPLE) | 0 | ||||
| -rw-r--r-- | test/files/codelib/.gitignore | 1 | ||||
| -rw-r--r-- | test/files/lib/.gitignore | 8 | ||||
| -rw-r--r-- | test/files/speclib/.gitignore | 1 | ||||
| -rw-r--r-- | tools/.gitignore | 1 |
8 files changed, 42 insertions, 54 deletions
diff --git a/.gitignore b/.gitignore index 84c048a73c..e60505f663 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,43 @@ +# +# Are you tempted to edit this file? +# +# First consider if the changes make sense for all, +# or if they are specific to your workflow/system. +# If it is the latter, you can augment this list with +# entries in .git/info/excludes +# +# see also test/files/.gitignore +# + +*.jar +*~ + +build.properties + +# target directories for ant build /build/ +/dists/ + +# other +/out/ +/bin/ +/sandbox/ + +# eclipse, intellij +/.classpath +/.project +/src/intellij/*.iml +/src/intellij/*.ipr +/src/intellij/*.iws +/.cache +/.idea +/.settings + +# bak files produced by ./cleanup-commit +*.bak + +# Standard symbolic link to build/quick/bin +qbin + +# Mac specific, but that is common enough a dev platform to warrant inclusion. +.DS_Store diff --git a/gitignore.SAMPLE b/gitignore.SAMPLE deleted file mode 100644 index 7114225a4a..0000000000 --- a/gitignore.SAMPLE +++ /dev/null @@ -1,28 +0,0 @@ -# see also test/files/.gitignore -/.gitignore -/test/files/.gitignore - -*.jar -*~ - -# target directories for ant build -/build/ -/dists/ - -# other -/out/ -/bin/ -/sandbox/ - -# eclipse, intellij -/.classpath -/.project -/src/intellij/*.iml -/src/intellij/*.ipr -/src/intellij/*.iws -/.cache -/.idea -/.settings - -# bak files produced by ./cleanup-commit -*.bak diff --git a/lib/.gitignore b/lib/.gitignore deleted file mode 100644 index 0c507490be..0000000000 --- a/lib/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -ant-contrib.jar -ant-dotnet-1.0.jar -ant.jar -fjbg.jar -forkjoin.jar -jline.jar -maven-ant-tasks-2.1.1.jar -msil.jar -scala-compiler.jar -scala-compiler-src.jar -scala-library.jar -scala-library-src.jar -scala-reflect.jar -scala-reflect-src.jar -vizant.jar diff --git a/test/files/gitignore.SAMPLE b/test/files/.gitignore index 161be5b55f..161be5b55f 100644 --- a/test/files/gitignore.SAMPLE +++ b/test/files/.gitignore diff --git a/test/files/codelib/.gitignore b/test/files/codelib/.gitignore deleted file mode 100644 index f77a26afb7..0000000000 --- a/test/files/codelib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -code.jar diff --git a/test/files/lib/.gitignore b/test/files/lib/.gitignore deleted file mode 100644 index b4ac0b8789..0000000000 --- a/test/files/lib/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -annotations.jar -enums.jar -genericNest.jar -javac-artifacts.jar -jsoup-1.3.1.jar -methvsfield.jar -nest.jar -scalacheck.jar diff --git a/test/files/speclib/.gitignore b/test/files/speclib/.gitignore deleted file mode 100644 index 2b26f5dfc5..0000000000 --- a/test/files/speclib/.gitignore +++ /dev/null @@ -1 +0,0 @@ -instrumented.jar diff --git a/tools/.gitignore b/tools/.gitignore deleted file mode 100644 index 57701c8353..0000000000 --- a/tools/.gitignore +++ /dev/null @@ -1 +0,0 @@ -push.jar |