--diff-filter=[ACDMRTUXB*]
Select only files that are
A
AddedC
CopiedD
DeletedM
ModifiedR
RenamedT
have their type (mode) changed
git diff --shortstat <master_branch> <cleanup_branch> | |
# 93 files changed, 838 insertions(+), 7592 deletions(-) | |
# Combine this with rev-list to limit reporting to a time period | |
git diff --shortstat $(git rev-list -n1 --before="1 day ago" <cleanup_branch>) | |
# 7 files changed, 7 insertions(+), 368 deletions(-) |
--diff-filter=[ACDMRTUXB*]
Select only files that are
A
AddedC
CopiedD
DeletedM
ModifiedR
RenamedT
have their type (mode) changed--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php | |
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php | |
@@ -114,7 +114,7 @@ class Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection extends Mage_Co | |
*/ | |
public function setIdFilter($optionId) | |
{ | |
- return $this->addFieldToFilter('option_id', array('in' => $optionId)); | |
+ return $this->addFieldToFilter('main_table.option_id', array('in' => $optionId)); | |
} |
wget http://xdebug.org/files/xdebug-2.2.1.tgz | |
tar -xzvf xdebug-2.2.1.tgz | |
cd xdebug-2.2.1 | |
phpize | |
./configure --enable-xdebug | |
sudo make | |
sudo make install | |
sudo service apache2 restart |
Mage::getModuleDir(‘controllers’, ‘Packagename_Modulename’); |
Index: app/code/core/Mage/SalesRule/Model/Observer.php | |
=================================================================== | |
--- app/code/core/Mage/SalesRule/Model/Observer.php (revision 146067) | |
+++ app/code/core/Mage/SalesRule/Model/Observer.php (working copy) | |
@@ -90,7 +90,6 @@ | |
$customerId = $order->getCustomerId(); | |
// use each rule (and apply to customer, if applicable) | |
- if ($order->getDiscountAmount() != 0) { | |
foreach ($ruleIds as $ruleId) { |
$ git clean -fdn | |
# -f force (because Obi-Wan says so) | |
# -d also removes directories | |
# -n dry run (ALWAYS do this first) | |
# You can also specify a path, but to be safe I always just cd to where I want to destroy changes |
rm -rf `find . -type d -name .svn` |
Index: app/code/core/Mage/Catalog/Block/Product/List.php | |
=================================================================== | |
--- app/code/core/Mage/Catalog/Block/Product/List.php | |
+++ app/code/core/Mage/Catalog/Block/Product/List.php | |
@@ -71,7 +71,7 @@ | |
// if the product is associated with any category | |
if ($categories->count()) { | |
// show products from this category | |
- $this->setCategoryId(current($categories->getIterator())); | |
+ $this->setCategoryId(current($categories->getIterator())->getId()); |