| gitflow | git |
|---|---|
git flow init |
git init |
git commit --allow-empty -m "Initial commit" |
|
git checkout -b develop master |
Mariusz Szot eniuz
eniuz
/ gist:7e2b3c3f640ca91c48d2
Last active
August 29, 2015 14:28
— forked from stuart11n/gist:9628955
rename git branch locally and remotely
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git branch -m old_branch new_branch # Rename branch locally | |
| git push origin :old_branch # Delete the old branch | |
| git push --set-upstream origin new_branch # Push the new branch, set local branch to track the new remote |
eniuz
/ gitflow-breakdown.md
Last active
August 29, 2015 14:28
— forked from JamesMGreene/gitflow-breakdown.md
A comparison of using `git flow` commands versus raw `git` commands.
eniuz
/ tmux-cheatsheet.markdown
Last active
September 4, 2015 08:24
— forked from MohamedAlaa/tmux-cheatsheet.markdown
tmux shortcuts & cheatsheet
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| find / -name 'php.ini' 2> /dev/null |
eniuz
/ gist:7fca76a12c6f5b97601e
Created
September 25, 2015 09:54
— forked from haruair/gist:b8ff4fb128488f5e1dbf
How to get all category tree node in Magento
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <?php | |
| // Usually, you can get category tree from category helper | |
| $helper = Mage::helper('catalog/category'); | |
| $nodes = $helper->getStoreCategories(); | |
| // return Varien_Data_Tree_Node_Collection | |
| // via Mage_Catalog_Model_Resource_Category | |
| // However, this get method return active category only. | |
| // Most of the samples are for collection of the category. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| vim .git/info/exclude | |
| git update-index --assume-unchanged <filename-here> |
eniuz
/ disable-magento-module-installation-local.xml
Created
October 30, 2015 16:34
Disable magento module installation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <skip_process_modules_updates>0</skip_process_modules_updates> |
eniuz
/ 0001-BUGIFX-Magento-Zend-Framework-1-PHP5.6.patch
Created
November 2, 2015 09:45
— forked from renttek/0001-BUGIFX-Magento-Zend-Framework-1-PHP5.6.patch
Bugfix for Zend Framework 1 in Magento (>= 1.7.*.*) + PHP 5.6
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| From 473846959772d8160b34b92ae3bcecddf24b972f Mon Sep 17 00:00:00 2001 | |
| From: =?UTF-8?q?Julian=20Nu=C3=9F?= <[email protected]> | |
| Date: Tue, 23 Sep 2014 21:07:29 +0200 | |
| Subject: [PATCH 1/1] [BUGIFX] Zend Framework 1 + PHP5.6 | |
| --- | |
| lib/Zend/Locale/Format.php | 22 +++++++++++----------- | |
| lib/Zend/Service/Audioscrobbler.php | 6 +++--- | |
| lib/Zend/Service/Technorati.php | 6 +++--- | |
| lib/Zend/Validate/Hostname.php | 4 ++-- |
eniuz
/ gist:ca29bffbbb8875639570
Created
November 2, 2015 09:45
— forked from jayelkaake/gist:34109641e5489e3e7e30
Command to update Magento to not show "Deprecated functionality: iconv_set_encoding()" message on OSX.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| sed -i '' -e "s/'internal_encoding'/'default_charset'/g" lib/Zend/XmlRpc/Client.php lib/Zend/Service/Audioscrobbler.php lib/Zend/Service/Technorati.php lib/Zend/Locale/Format.php lib/Zend/Validate/Hostname.php lib/Zend/Validate/StringLength.php |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <adminhtml> | |
| <args> | |
| <modules> | |
| <!-- | |
| $routeTag - your_custom_module | |
| $module - YourCustomModule_ | |
| <{$routeTag} before="Mage_Adminhtml">{$module}_Adminhtml</{$routeTag}> | |
| </modules> | |
| </args> | |
| </adminhtml> |