summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@opscode.com>2012-01-17 11:19:42 -0800
committerBryan McLellan <btm@opscode.com>2012-01-17 11:19:42 -0800
commitc75210add6b865046d87b4f508c68e917d4acbe5 (patch)
tree95b76f9e3fcd94e69695ee1b4779c4fcd3f9f608
parentada782b40c634c92685e8fa1fae20aabcd95859b (diff)
downloadchef-c75210add6b865046d87b4f508c68e917d4acbe5.tar.gz
ignore autogenerated content on merge
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..18f4b2447c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# 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