| """ | |
| jQuery templates use constructs like: | |
| {{if condition}} print something{{/if}} | |
| This, of course, completely screws up Django templates, | |
| because Django thinks {{ and }} mean something. | |
| Wrap {% verbatim %} and {% endverbatim %} around those | |
| blocks of jQuery templates and this will try its best |
| from __future__ import with_statement | |
| from fabric.api import env, run, settings, hide | |
| from fabric.decorators import hosts, runs_once | |
| venv = "/home/websites/.virtualenvs/twtv3/" | |
| env.user = 'webdev' | |
| env.hosts = [ | |
| '192.168.1.10', | |
| '192.168.1.11', |
| alias gs='git status' | |
| alias gai='git add --interactive' | |
| alias gsvn='git svn' | |
| alias gsup='gsvn fetch && gsvn rebase' | |
| alias gsp='gsup && gsvn dcommit' | |
| alias gf='git fetch' | |
| alias gr='git rebase' | |
| alias gp='gup && git push' | |
| alias gff='git flow feature' | |
| alias gfr='git flow release' |
| def curry(f, *args, **kwargs): | |
| def curried(*more_args, **more_kwargs): | |
| return f(*(args+more_args), **dict(kwargs, **more_kwargs)) | |
| return curried | |
| class Person(object): | |
| def __init__(self, name, gender): | |
| self.name = name | |
| self.gender = gender |
| # This is a short collection of tools that are useful for managing your | |
| # known_hosts file. In this case, I'm using the '-f' flag to specify the | |
| # global known_hosts file because I'll be adding many deploy users on this | |
| # system. Simply omit the -f flag to operate on ~/.ssh/known_hosts | |
| # Add entry for host | |
| ssh-keyscan -H github.com >> /etc/ssh/ssh_known_hosts | |
| # Scan known hosts | |
| ssh-keygen -f /etc/ssh/ssh_known_hosts -F github.com |
A good commit message looks like this:
Header line: explaining the commit in one line
Body of commit message is a few lines of text, explaining things
in more detail, possibly giving some background about the issue
being fixed, etc etc.
The body of the commit message can be several paragraphs, and
please do proper word-wrap and keep columns shorter than about
| #target photoshop | |
| var sizes = { | |
| 'xlarge': [1490, 730], | |
| 'large': [1160, 568], | |
| 'medium': [890, 436], | |
| 'small': [760, 372] | |
| }; |
| i386 : iPhone Simulator | |
| x86_64 : iPhone Simulator | |
| arm64 : iPhone Simulator | |
| iPhone1,1 : iPhone | |
| iPhone1,2 : iPhone 3G | |
| iPhone2,1 : iPhone 3GS | |
| iPhone3,1 : iPhone 4 | |
| iPhone3,2 : iPhone 4 GSM Rev A | |
| iPhone3,3 : iPhone 4 CDMA | |
| iPhone4,1 : iPhone 4S |
| ;[program:andrewingram-gunicorn] | |
| ;command=/var/www/andrewingram.net/bin/gunicorn_django /var/www/andrewingram.net/src/andrewingram/andrewingram/settings.py | |
| ;directory=/var/www/andrewingram.net | |
| ;logfile=/var/www/andrewingram.net/log/supervisor.log | |
| ;user=deployer | |
| ;autostart=true | |
| ;autorestart=true | |
| ;redirect_stderr=True | |
| [program:andrewingram-uwsgi] |
Locate the section for your github remote in the .git/config file. It looks like this:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git@github.com:joyent/node.git
Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this: