diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-08-29 14:58:13 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-08-30 08:49:42 +0200 |
commit | f0bbd2ca32acb40be37dc382c1f95081deca3f22 (patch) | |
tree | e04e2ee1a2e9629f9633c8d80781edc2c139634f /.gitignore | |
parent | 996a95dac9cff30313316cc6b2448ec381852042 (diff) | |
download | scala-f0bbd2ca32acb40be37dc382c1f95081deca3f22.tar.gz scala-f0bbd2ca32acb40be37dc382c1f95081deca3f22.tar.bz2 scala-f0bbd2ca32acb40be37dc382c1f95081deca3f22.zip |
Paring back the scope of our shared .gitignore
Importantly, limit the exclusion of build.properties
to the file in the root directory, paving the way for
the return of an SBT build.
- Unignores .bak, .jar, and ~
- limit ignorance of qbin to the root directory
.log files, generated by partest, are still ignored.
To see ignored files in your workspace, try:
git ls-files --others --ignored --exclude-standard -- test | grep log
git status --ignored -- test
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index e60505f663..f90835d970 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,21 @@ # see also test/files/.gitignore # -*.jar -*~ +# +# JARs aren't checked in, they are fetched by Ant / pull_binary_libs.sh +# +# We could be more concise with /lib/**/*.jar but that assumes +# a late-model git. +# +/lib/ant/*.jar +/lib/*.jar +/test/files/codelib/*.jar +/test/files/lib/*.jar +/test/files/speclib/instrumented.jar +/tools/*.jar -build.properties +# Developer specific Ant properties +/build.properties # target directories for ant build /build/ @@ -33,11 +44,5 @@ build.properties /.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 +/qbin |