From 162e5cb882fe66ae34a3b88ce65368be965fe45b Mon Sep 17 00:00:00 2001 From: Bryan McLellan Date: Tue, 4 Sep 2012 11:50:23 -0700 Subject: Add version.rb files to .gitattributes Ignore these files when merging because they're usually just a change to the version. --- .gitattributes | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.gitattributes') 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 -- cgit v1.2.1