summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Collapse)AuthorAgeFilesLines
* [OC-3564] move core Chef to the repo root \o/ \m/Seth Chisamore2012-10-301-9/+4
| | | | The opscode/chef repository now only contains the core Chef library code used by chef-client, knife and chef-solo!
* Add version.rb files to .gitattributesBryan McLellan2012-09-041-0/+6
| | | | | Ignore these files when merging because they're usually just a change to the version.
* ignore autogenerated content on mergeBryan McLellan2012-01-171-0/+5