diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-08-30 08:31:09 -0700 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-08-30 08:31:09 -0700 |
| commit | dd2023789202fa944ea7d4f04e25ad4092d37326 (patch) | |
| tree | 6cfa74133404ef08a722c6d2102b542f7d1ae9de | |
| parent | c60ed61f18bbc4e0b5907fc4cc726ff41dd0434b (diff) | |
| parent | f0bbd2ca32acb40be37dc382c1f95081deca3f22 (diff) | |
| download | scala-dd2023789202fa944ea7d4f04e25ad4092d37326.tar.gz scala-dd2023789202fa944ea7d4f04e25ad4092d37326.tar.bz2 scala-dd2023789202fa944ea7d4f04e25ad4092d37326.zip | |
Merge pull request #2890 from retronym/topic/one-mans-bliss
Paring back the scope of our shared .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 |