[icinga-checkins] icinga.org: icingaweb2/master: Do not spread .gitattributes over multiple files

git at icinga.org git at icinga.org
Thu Nov 13 17:53:26 CET 2014


Module: icingaweb2
Branch: master
Commit: cf7e768f390b06bcc685eb7e830dc461d5727231
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=cf7e768f390b06bcc685eb7e830dc461d5727231

Author: Eric Lippmann <eric.lippmann at netways.de>
Date:   Thu Oct 30 13:21:16 2014 +0100

Do not spread .gitattributes over multiple files

---

 .gitattributes                 |    4 ++++
 .vagrant-puppet/.gitattributes |    1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index e4504cf..35002d0 100644
--- 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
diff --git a/.vagrant-puppet/.gitattributes b/.vagrant-puppet/.gitattributes
deleted file mode 100644
index af67531..0000000
--- a/.vagrant-puppet/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf



More information about the icinga-checkins mailing list