summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-07-15 10:17:26 +1000
committerJason Zaugg <jzaugg@gmail.com>2013-07-17 00:35:55 +1000
commitb51cb581270da7021b2ea122dc059847101d56a7 (patch)
tree8f6af1551fe8b1a2e8ecaf69584d3dc7e222531c /.gitignore
parent11dcf82910b388046e675d76d277b09b931d5363 (diff)
downloadscala-b51cb581270da7021b2ea122dc059847101d56a7.tar.gz
scala-b51cb581270da7021b2ea122dc059847101d56a7.tar.bz2
scala-b51cb581270da7021b2ea122dc059847101d56a7.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.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore42
1 files changed, 42 insertions, 0 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