summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSolomon Hykes <solomon@dotcloud.com>2013-09-11 18:38:09 -0700
committerSolomon Hykes <solomon@dotcloud.com>2013-09-11 18:38:09 -0700
commit45cedefadb444e8d7305defd246c63537fca04df (patch)
tree37d880e2d2e0286264be722f41d264390320dee1 /.gitignore
parentebee8f28ac45e7907a35331383f8b9b4ab338353 (diff)
downloaddocker-45cedefadb444e8d7305defd246c63537fca04df.tar.gz
hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ca58f735cb..5843eaf9cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,6 @@ docs/_templates
.gopath/
.dotcloud
*.test
-vendor/
bundles/
+.hg/
+.git/