diff options
| author | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-08 13:27:37 -0800 |
|---|---|---|
| committer | Kartik Null Cating-Subramanian <ksubramanian@chef.io> | 2016-01-08 13:27:37 -0800 |
| commit | ab5c35a7f72ab7c58a463ddf1dfe937d8db84f71 (patch) | |
| tree | 8fca5ac69528f44ddd39e4758ab7ec61c1320f6b | |
| parent | 5a0031d962402221b580df270e8802b71d5ea1f0 (diff) | |
| download | chef-ab5c35a7f72ab7c58a463ddf1dfe937d8db84f71.tar.gz | |
Update .gitignores to not clash
| -rw-r--r-- | .gitignore | 14 | ||||
| -rw-r--r-- | omnibus/.gitignore | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index cdb29d0679..b8e8cad1de 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,21 @@ .autotest coverage .DS_Store -pkg +pkg/* tags */tags *~ .chef -# you should check in your Gemfile.lock in applications, and not in gems +# You should check in your Gemfile.lock in applications, and not in gems +# This also matches Berksfile.lock external_tests/*.lock -*.lock -Gemfile.local +/*.lock +/Gemfile.local -# Do not check in the .bundle directory, or any of the files inside it. Those files are specific to each particular machine, and are used to persist installation options between runs of the bundle install command. +# Do not check in the .bundle directory, or any of the files inside it. Those +# files are specific to each particular machine, and are used to persist +# installation options between runs of the bundle install command. .bundle # ignore some common Bundler 'binstubs' directory names @@ -36,7 +39,6 @@ doc/ # Test Kitchen .kitchen/ -Berksfile.lock # Vagrant Vagrantfile diff --git a/omnibus/.gitignore b/omnibus/.gitignore index b7a3079d95..d97af2ef9c 100644 --- a/omnibus/.gitignore +++ b/omnibus/.gitignore @@ -1,9 +1,5 @@ -*.gem -.bundle vendor/bundle pkg/* -.vagrant -.kitchen .kitchen.local.yml bin/* files/chef-server-cookbooks/cache/ |