diff options
| author | Seth Chisamore <schisamo@opscode.com> | 2012-10-30 10:39:35 -0400 |
|---|---|---|
| committer | Seth Chisamore <schisamo@opscode.com> | 2012-10-30 10:39:35 -0400 |
| commit | 24dc69a9a97e82a6e4207de68d6dcc664178249b (patch) | |
| tree | 19bb289c9f88b4bbab066bc56b95d6d222fd5c35 /.gitattributes | |
| parent | 9348c1c9c80ee757354d624b7dc1b78ebc7605c4 (diff) | |
| download | chef-24dc69a9a97e82a6e4207de68d6dcc664178249b.tar.gz | |
[OC-3564] move core Chef to the repo root \o/ \m/
The opscode/chef repository now only contains the core Chef library code
used by chef-client, knife and chef-solo!
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitattributes b/.gitattributes index 68f32f5d66..bb9914a8b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,11 +1,6 @@ # git config merge.ignore.name 'ignore changes merge driver' # git config merge.ignore.driver 'touch %A' -chef/distro/common/html/* merge=ignore -chef/distro/common/man/man1/* merge=ignore -chef/distro/common/man/man8/* merge=ignore -chef/lib/chef/version.rb merge=ignore -chef-solr/lib/chef/solr/version.rb merge=ignore -chef-server/lib/chef-server/version.rb merge=ignore -chef-server-webui/lib/chef-server-webui/version.rb merge=ignore -chef-server-api/lib/chef-server-api/version.rb merge=ignore -chef-expander/lib/chef/expander/version.rb merge=ignore +distro/common/html/* merge=ignore +distro/common/man/man1/* merge=ignore +distro/common/man/man8/* merge=ignore +lib/chef/version.rb merge=ignore |