JeffCost

IGNORE LOCAL CHANGES

Ignore local changes to repository files or directories git update-index --assume-unchanged path/to/file/or/directory

ALIAS

Or you can alias it in your ~/.gitconfig [alias] au = update-index --assume-unchanged

UN-IGNORE LOCAL CHANGES

JeffCost

1. Clone your fork:

git clone git@github.com:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

JeffCost

<snippet>
    <content><![CDATA[<?php

class ${1:namespace}_${2:moduleName}_${3:ControllerName}Controller extends Mage_Core_Controller_Front_Action {        

    public function indexAction()
    {
        ${4:// ... code ...}
    }
}${0}]]></content>