From 67b5c2aca9d14b9659907b9330c6049295d6da47 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 31 Dec 2009 02:26:45 -0700 Subject: [PATCH] Add CRLF ignores. --- .gitattributes | 10 ++++++++-- .gitignore | 14 +++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.gitattributes b/.gitattributes index 3f0a09f5d..3e39a5020 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,8 @@ -*/config/conf.xml ident -*/config/*.dist ident +# Add tracking hash to config files +/*/config/conf.xml ident +/*/config/*.dist ident + +# Ignore CRLF +framework/iCalendar/docs/examples/* -crlf +framework/iCalendar/tests/fixtures/* -crlf +framework/iCalendar/tests/fixtures/vTimezone/* -crlf diff --git a/.gitignore b/.gitignore index c651b3e09..b32b9a3e6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,13 @@ run-tests.log */config/*.txt # Application specific excludes +ApertureToAnselExportPlugin/build/ +ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.pbxuser +!ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/default.pbxuser +ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.perspectivev3 +ApertureToAnselExportPlugin/*.pbxproject +ApertureToAnselExportPlugin/Installer/*.pkg + framework/Rdo/examples/Horde/Rdo/conf.php iPhoto2Ansel/build/ @@ -27,10 +34,3 @@ iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.pbxuser iPhoto2Ansel/iPhoto2Ansel.xcodeproj/*.perspectivev3 iPhoto2Ansel/*.pbxproject iPhoto2Ansel/Installer/*.pkg - -ApertureToAnselExportPlugin/build/ -ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.pbxuser -!ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/default.pbxuser -ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/*.perspectivev3 -ApertureToAnselExportPlugin/*.pbxproject -ApertureToAnselExportPlugin/Installer/*.pkg -- 2.11.0