blob: 68f32f5d664e35d5b71d9bdd1e7bf90ca20b4b3b (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
# git config merge.ignore.name 'ignore changes merge driver'
# git config merge.ignore.driver 'touch %A'
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
|
