diff options
| -rw-r--r-- | .gitattributes | 5 |
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 |