From f527652d3035f33ae7af96fddb88c933a67f6e31 Mon Sep 17 00:00:00 2001 From: Mateusz Kutyba Date: Thu, 3 Dec 2015 07:28:05 +0100 Subject: [PATCH 1/5] new files added in 1.9.2.x --- Magento.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Magento.gitignore b/Magento.gitignore index e2ea0133..882e3554 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -43,10 +43,13 @@ app/etc/local.xml.additional app/etc/local.xml.template app/etc/local.xml app/.htaccess +app/bootstrap.php app/locale/ app/Mage.php /cron.php cron.sh +dev/.htaccess +dev/tests/functional/ downloader/ errors/ favicon.ico @@ -105,6 +108,7 @@ pear/ php.ini.sample pkginfo/ RELEASE_NOTES.txt +shell/.htaccess shell/abstract.php shell/compiler.php shell/indexer.php From 2aa9f9215f0ba6a0886917d72555f02397da0d69 Mon Sep 17 00:00:00 2001 From: Mateusz Kutyba Date: Thu, 3 Dec 2015 07:28:27 +0100 Subject: [PATCH 2/5] simplified rules for media dir --- Magento.gitignore | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Magento.gitignore b/Magento.gitignore index 882e3554..7f220e9c 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -93,14 +93,7 @@ LICENSE.html LICENSE.txt LICENSE_EE* /mage -media/customer/ -media/dhl/ -media/downloadable/ -media/.htaccess -media/import/ -media/xmlconnect/ -media/catalog/product/cache/ -media/catalog/product/placeholder/default/ +media/ /api.php nbproject/ pear From 5552f5e36094a97b158481b32e8e624df55c7bf0 Mon Sep 17 00:00:00 2001 From: Mateusz Kutyba Date: Thu, 3 Dec 2015 07:29:12 +0100 Subject: [PATCH 3/5] simplified rules for Mage* module files --- Magento.gitignore | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/Magento.gitignore b/Magento.gitignore index 7f220e9c..30663f17 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -14,26 +14,7 @@ app/design/frontend/default/modern/ app/design/frontend/enterprise/default app/design/install/ app/etc/modules/Enterprise_* -app/etc/modules/Mage_All.xml -app/etc/modules/Mage_Api.xml -app/etc/modules/Mage_Api2.xml -app/etc/modules/Mage_Authorizenet.xml -app/etc/modules/Mage_Bundle.xml -app/etc/modules/Mage_Captcha.xml -app/etc/modules/Mage_Centinel.xml -app/etc/modules/Mage_Compiler.xml -app/etc/modules/Mage_ConfigurableSwatches.xml -app/etc/modules/Mage_Connect.xml -app/etc/modules/Mage_CurrencySymbol.xml -app/etc/modules/Mage_Downloadable.xml -app/etc/modules/Mage_ImportExport.xml -app/etc/modules/Mage_LoadTest.xml -app/etc/modules/Mage_Oauth.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/Mage_*.xml app/etc/modules/Phoenix_Moneybookers.xml app/etc/modules/Cm_RedisSession.xml app/etc/applied.patches.list From 571118925dcd1db1952a8b0e71229e0b09548a0d Mon Sep 17 00:00:00 2001 From: Mateusz Kutyba Date: Thu, 3 Dec 2015 07:29:41 +0100 Subject: [PATCH 4/5] exclude only locale en_US --- Magento.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Magento.gitignore b/Magento.gitignore index 30663f17..236d81ce 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -25,7 +25,7 @@ app/etc/local.xml.template app/etc/local.xml app/.htaccess app/bootstrap.php -app/locale/ +app/locale/en_US/ app/Mage.php /cron.php cron.sh From b6e56775b5ea1dda9f5d77411cb5ecd6a113eaba Mon Sep 17 00:00:00 2001 From: Mateusz Kutyba Date: Thu, 3 Dec 2015 07:30:11 +0100 Subject: [PATCH 5/5] exclude only community code that is shipped with Magento --- Magento.gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Magento.gitignore b/Magento.gitignore index 236d81ce..195c9b7a 100644 --- a/Magento.gitignore +++ b/Magento.gitignore @@ -1,8 +1,8 @@ .htaccess.sample .modgit/ .modman/ -app/code/community/Phoenix/ -app/code/community/Cm/ +app/code/community/Phoenix/Moneybookers/ +app/code/community/Cm/RedisSession/ app/code/core/ app/design/adminhtml/default/default/ app/design/frontend/base/