summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJosh Wilsdon <jwilsdon@joyent.com>2010-10-22 13:29:19 -0700
committerJosh Wilsdon <jwilsdon@joyent.com>2010-10-22 13:29:19 -0700
commit9cf5e1051b7652bf727c92a51a7e44081a595a6b (patch)
treeed678ee0478c1348ca97e51eacd43ae9206c97a2 /.gitignore
parenta7faece9d7f707437e0180a19227cb976dc114e9 (diff)
parent9713defa8531e0b16b7ba8e0db2ae7580a6f4ef1 (diff)
downloadillumos-joyent-9cf5e1051b7652bf727c92a51a7e44081a595a6b.tar.gz
Merge from illumos branch
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore12
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 10f8385fd7..699b5ad834 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,13 @@
*.so.1
*.a
*.pyc
-packages/
-log/
+/closed
+/illumos.sh
+/log
+/nightly
+/on-closed-bins-nd.i386.tar.bz2
+/on-closed-bins.i386.tar.bz2
+/packages
+/proto
+.make.state
+.build.tstamp