summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2012-09-04 11:50:23 -0700
committerBryan McLellan <btm@opscode.com>2012-09-04 11:50:23 -0700
commit162e5cb882fe66ae34a3b88ce65368be965fe45b (patch)
tree9fa69c5614da65985ab69fb71832eaa679d1805c
parentf253f06f6efa44fc0928555db86619f46ea0b528 (diff)
downloadchef-162e5cb882fe66ae34a3b88ce65368be965fe45b.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--.gitattributes6
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