From ce269203807117decf62733651327924160688cd Mon Sep 17 00:00:00 2001
From: Aneurin <anny@anny.fm>
Date: Thu, 7 Jun 2012 18:41:25 +0200
Subject: [PATCH] Derived new, more flexible ignores from
 https://github.com/folkdigital/gitignore - allows version control of files in
 any location (with minimal edits to gitignore) rather than restricting to new
 directories

---
 Magento.gitignore | 206 ++++++++++++++++++++++------------------------
 1 file changed, 99 insertions(+), 107 deletions(-)

diff --git a/Magento.gitignore b/Magento.gitignore
index 52e8bb25..b90386b7 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,107 +1,99 @@
-.modgit/
-app/code/community/Find/
-app/code/community/Phoenix/
-app/code/core/
-app/design/adminhtml/default/default/
-app/design/adminhtml/default/find/
-app/design/frontend/base/
-app/design/frontend/default/blank/
-app/design/frontend/default/default/
-app/design/frontend/default/iphone/
-app/design/frontend/default/modern/
-app/design/frontend/enterprise/default
-app/design/install/
-app/etc/modules/Enterprise_*
-app/etc/modules/Find_Feed.xml
-app/etc/modules/Mage_All.xml
-app/etc/modules/Mage_Api.xml
-app/etc/modules/Mage_Authorizenet.xml
-app/etc/modules/Mage_Bundle.xml
-app/etc/modules/Mage_Centinel.xml
-app/etc/modules/Mage_Compiler.xml
-app/etc/modules/Mage_Connect.xml
-app/etc/modules/Mage_Downloadable.xml
-app/etc/modules/Mage_ImportExport.xml
-app/etc/modules/Mage_LoadTest.xml
-app/etc/modules/Mage_PageCache.xml
-app/etc/modules/Mage_Persistent.xml
-app/etc/modules/Mage_Weee.xml
-app/etc/modules/Mage_Widget.xml
-app/etc/modules/Mage_XmlConnect.xml
-app/etc/modules/Phoenix_Moneybookers.xml
-app/etc/config.xml
-app/etc/enterprise.xml
-app/etc/local.xml.additional
-app/etc/local.xml.template
-app/.htaccess
-app/locale/
-app/Mage.php
-cron.php
-cron.sh
-downloader/
-errors/
-favicon.ico
-get.php
-includes/
-index.php
-index.php.sample
-install.php
-js/blank.html
-js/calendar/
-js/enterprise/
-js/extjs/
-js/firebug/
-js/flash/
-js/index.php
-js/jscolor/
-js/lib/
-js/mage/
-js/prototype/
-js/scriptaculous/
-js/spacer.gif
-js/tiny_mce/
-js/varien/
-lib/3Dsecure/
-lib/Apache/
-lib/flex/
-lib/googlecheckout/
-lib/.htaccess
-lib/LinLibertineFont/
-lib/Mage/
-lib/PEAR/
-lib/phpseclib/
-lib/Varien/
-lib/Zend/
-LICENSE_AFL.txt
-LICENSE.html
-LICENSE.txt
-LICENSE_EE*
-mage
-media/customer/
-media/downloadable/
-media/.htaccess
-media/import/
-media/xmlconnect/
-nbproject/
-pear
-pear/
-php.ini.sample
-pkginfo/
-RELEASE_NOTES.txt
-shell/abstract.php
-shell/compiler.php
-shell/indexer.php
-shell/log.php
-skin/adminhtml/default/default/
-skin/adminhtml/default/enterprise
-skin/frontend/base/
-skin/frontend/default/blank/
-skin/frontend/default/blue/
-skin/frontend/default/default/
-skin/frontend/default/french/
-skin/frontend/default/german/
-skin/frontend/default/iphone/
-skin/frontend/default/modern/
-skin/frontend/enterprise
-skin/install/
-var/
+# System files
+.DS_Store
+.htaccess
+
+# Miscellaneous
+/*.php
+/*.html
+/*.txt
+/*.sh
+/favicon.ico
+/mage
+/downloader/
+/errors/
+/includes/
+/lib/*
+/media/*
+/pkginfo/
+/shell/
+/var/
+
+# Default app code
+
+/app/Mage.php
+/app/code/core/*
+/app/etc/config.xml
+/app/etc/local.xml*
+
+/app/design/adminhtml/default/default/layout/*
+/app/design/adminhtml/default/default/locale/*
+/app/design/adminhtml/default/default/template/*
+
+/app/design/adminhtml/default/find/
+
+/app/design/frontend/base/default/etc/*
+/app/design/frontend/base/default/layout/*
+/app/design/frontend/base/default/template/*
+
+/app/design/frontend/default/*
+!/app/design/frontend/default/default/
+/app/design/frontend/default/default/*
+!/app/design/frontend/default/default/layout/
+/app/design/frontend/default/default/layout/*
+!/app/design/frontend/default/default/template/
+/app/design/frontend/default/default/template/*
+
+/app/design/install/
+
+# JS and skin directories
+
+/js/*
+
+/skin/adminhtml/default/*
+!/skin/adminhtml/default/default/
+/skin/adminhtml/default/default/*
+!/skin/adminhtml/default/default/css/
+/skin/adminhtml/default/default/css/*
+!/skin/adminhtml/default/default/images/
+/skin/adminhtml/default/default/images/*
+!/skin/adminhtml/default/default/media/
+/skin/adminhtml/default/default/media/*
+/skin/adminhtml/default/default/xmlconnect/
+
+/skin/frontend/base/*
+!/skin/frontend/base/default/
+/skin/frontend/base/default/*
+!/skin/frontend/base/default/css/
+/skin/frontend/base/default/css/*
+/skin/frontend/base/default/favicon.ico
+!/skin/frontend/base/default/images/
+/skin/frontend/base/default/images/*
+!/skin/frontend/base/default/js/
+/skin/frontend/base/default/js/*
+
+/skin/frontend/default/*
+!/skin/frontend/default/default/
+/skin/frontend/default/default/*
+!/skin/frontend/default/default/css/
+/skin/frontend/default/default/css/*
+!/skin/frontend/default/default/images/
+/skin/frontend/default/default/images/*
+!/skin/frontend/default/default/js/
+/skin/frontend/default/default/js/*
+
+/skin/install/
+
+# Bundled modules
+
+/app/code/community/Find/
+/app/code/community/Phoenix/
+
+# Language files & email templates
+
+/app/locale/*
+!/app/locale/en_US/
+/app/locale/en_US/*
+!/app/locale/en_US/template/
+/app/locale/en_US/template/*
+!/app/locale/en_US/template/email/
+/app/locale/en_US/template/email/*