git branch -f <branch> [<destination>]git hoist <branch> [<destination>]git ff [<destination>]git catchup [<branch>] [<remote>]
git subup
| server { | |
| listen 80; | |
| server_name example.com; | |
| root /path/to/public; | |
| location / { | |
| try_files $uri /index.php?uri=$uri; | |
| } |
| wdiff = diff --color-words --word-diff-regex='[^[:space:]\\(\\)/<>{}\",_-]+' |
| <?php | |
| namespace Fuel\Migrations; | |
| class Db_Stuff | |
| { | |
| public function up() | |
| { | |
| // Try/catch so that we can provide a nicer error message and gracefully fall out of the migration |
| if [ $(basename $(pwd)) == ".git" ]; then | |
| cd .. | |
| export GIT_DIR=.git | |
| fi | |
| git checkout $(git rev-parse master) | |
| git reset --hard HEAD -- | |
| git submodule update --init --recursive | |
| ant |
| * { | |
| -webkit-filter: grayscale(100%); | |
| -moz-filter: grayscale(100%); | |
| -ms-filter: grayscale(100%); | |
| -o-filter: grayscale(100%); | |
| filter: grayscale(100%); | |
| filter: url(grayscale.svg); /* Firefox 4+ */ | |
| filter: gray; /* IE 6-9 */ | |
| } |
| <?php | |
| #if (${NAMESPACE}) | |
| namespace ${NAMESPACE}; | |
| #end | |
| class Controller_${NAME} extends \Controller_Template { | |
| public function action_index() { |
| <?xml version="1.0" encoding="UTF-8"?> | |
| <templateSet group="JavaScript"> | |
| <template name="ready" value="$(function() { 	$END$ })" description="HOJS says do this" toReformat="true" toShortenFQNames="true"> | |
| <context> | |
| <option name="HTML_TEXT" value="false" /> | |
| <option name="HTML" value="false" /> | |
| <option name="XSL_TEXT" value="false" /> | |
| <option name="XML" value="false" /> | |
| <option name="CSS_PROPERTY_VALUE" value="false" /> | |
| <option name="CSS_DECLARATION_BLOCK" value="false" /> |
| cdup() { | |
| p=${1} | |
| if [[ $p = -* ]]; then | |
| c="cd " | |
| while [[ $p -lt 0 ]]; do | |
| c=$c"../" | |
| let p=p+1 | |
| done | |
| $c | |
| else |
| #!/bin/bash | |
| KEEP=$@ | |
| branches=$(git branch | grep -v "*" | grep -v "detached" | grep -v "no branch") | |
| if [ "$KEEP" != "" ]; then | |
| for notthis in $KEEP; do | |
| branches=$(echo "$branches" | grep -vE "$notthis") | |
| done |