diff options
| author | Bryan McLellan <btm@opscode.com> | 2012-09-04 11:50:23 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-12-24 13:02:48 -0800 |
| commit | eb5e9f1eaeed10f8fbef819604095098521b40e2 (patch) | |
| tree | 9faf22cc9696cc4bad95ac74dde953b450bc7389 | |
| parent | 373b140a880e423d233f866a592a44b30baba492 (diff) | |
| download | chef-eb5e9f1eaeed10f8fbef819604095098521b40e2.tar.gz | |
Add version.rb files to .gitattributes
Ignore these files when merging because they're usually
just a change to the version.
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 18f4b2447c..68f32f5d66 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,9 @@ 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 |