Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

ignore autogenerated content on merge

  • Loading branch information...
commit c75210add6b865046d87b4f508c68e917d4acbe5 1 parent ada782b
@btm btm authored
Showing with 5 additions and 0 deletions.
  1. +5 −0 .gitattributes
View
5 .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
Please sign in to comment.
Something went wrong with that request. Please try again.