Do not spread .gitattributes over multiple files

2014-10-30 13:21:16 +01:00 · 2014-10-30 13:21:16 +01:00 · cf7e768f39
parent 344bda04b9
commit cf7e768f39
2 changed files with 4 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,5 @@
+# Exclude files related to git when generating an archive
 .git* export-ignore
+
+# Normalize puppet manifests' line endings to LF on checkin and prevent conversion to CRLF when the files are checked out
+.vagrant-puppet/* eol=lf
--- a/.vagrant-puppet/.gitattributes
+++ b/.vagrant-puppet/.gitattributes
@ -1 +0,0 @@
-* -crlf