Permalink
Browse files

ignore autogenerated content on merge

  • Loading branch information...
btm committed Jan 17, 2012
1 parent ada782b commit c75210add6b865046d87b4f508c68e917d4acbe5
Showing with 5 additions and 0 deletions.
  1. +5 −0 .gitattributes
View
@@ -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

0 comments on commit c75210a

Please sign in to comment.