Permalink
Browse files

Add version.rb files to .gitattributes

Ignore these files when merging because they're usually
just a change to the version.
  • Loading branch information...
1 parent f253f06 commit 162e5cb882fe66ae34a3b88ce65368be965fe45b @btm btm committed Sep 4, 2012
Showing with 6 additions and 0 deletions.
  1. +6 −0 .gitattributes
View
@@ -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

0 comments on commit 162e5cb

Please sign in to comment.