diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-07-15 10:17:26 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-08-30 11:58:03 +0200 |
| commit | 133b5c0750259260bfc0b6f354757c3d79bb2c55 (patch) | |
| tree | ff36e294d33a9e56ce7668963150e19a6bd082cd /.gitignore | |
| parent | 7a0d983aedd8ad8f3f41a22ffa0ce4b6ab2f1523 (diff) | |
| download | scala-133b5c0750259260bfc0b6f354757c3d79bb2c55.tar.gz scala-133b5c0750259260bfc0b6f354757c3d79bb2c55.tar.bz2 scala-133b5c0750259260bfc0b6f354757c3d79bb2c55.zip | |
Commit .gitignore directly
Rather than relying on the cloner to copy the
provided gitignore.SAMPLE files.
This finishes the job started in c48509598, mostly
by reverting that commit and moving the two existing
SAMPLE files to the final destinations.
Use `.git/info/exclude` to augment the list of patterns
with entries specific to your workflow.
(cherry picked from commit b51cb581270da7021b2ea122dc059847101d56a7)
==============================================
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
(cherry picked from commit f0bbd2ca32acb40be37dc382c1f95081deca3f22)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..f90835d970 --- /dev/null +++ b/.gitignore @@ -0,0 +1,48 @@ +# +# 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 +# + +# +# 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 + +# Developer specific Ant properties +/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 + +# Standard symbolic link to build/quick/bin +/qbin |