git push origin :fakebranch
git pull origin
git merge master
git push remote local_branch:remote_branch
| 1 #!/bin/bash | |
| 2 cd "$(dirname "${BASH_SOURCE[0]}")/.." | |
| 3 ROOTDIR="$(pwd)" | |
| 4 PYTHON="$ROOTDIR/venv/bin/python" | |
| 5 DJANGOBIN="$ROOTDIR/venv/lib/python2.7/site-packages/django/bin" | |
| 6 | |
| 7 export PYTHONPATH="$ROOTDIR" | |
| 8 export DJANGO_SETTINGS_MODULE="simple.settings" | |
| 9 | |
| 10 "$PYTHON" "$DJANGOBIN/django-admin.py" $* |
| { | |
| "auto_complete": false, | |
| "auto_complete_commit_on_tab": true, | |
| "bold_folder_labels": true, | |
| "caret_style": "phase", | |
| "color_scheme": "Packages/User/themes/PlasticCodeWrap.tmTheme", | |
| "drag_text": false, | |
| "ensure_newline_at_eof_on_save": true, | |
| "fade_fold_buttons": false, | |
| "font_face": "Menlo", |
| Drag(*)nBall Z: Epic BETA | |
| World Tags: OPEN / PvP | |
| DBE Team: ThunderZ, Uopcut, Michael | |
| DBE Helper Team: Anigma, Hellion, Relky | |
| Name: | |
| Jared | |
| Your name can only contain letters and numbers [OK] |
| source: http://www.reddit.com/r/EDH/comments/1plyyj/kingdoms_edh_variant | |
| I did a quick search, and didn't see any previous posts in this subreddit about this variant, so I thought I'd share in case others hadn't heard of it yet. | |
| Basically, this is a variant for 5-6 players. You will need, in addition to a deck for each person, 1 Plains, 1 Forest, 2 Mountains, 1 Swamp, and if playing with a 6th player, 1 Island. | |
| Randomly pass out one land to each player, face down. No one (except the King, or if the Usurper kills the King) can reveal who he is until the game is over. You can claim to be a particular role, but you cannot reveal your card. | |
| Plains = King. The King starts at 50 life, and goes first. The goal of the king is to be the last man standing. |
| $ httperf --hog --server www.cyberciti.biz --num-conn 100 --ra 10 --timeout 5 | |
| Total: connections 100 requests 100 replies 100 test-duration 10.107 s | |
| Connection rate: 9.9 conn/s (101.1 ms/conn, <=3 concurrent connections) | |
| Connection time [ms]: min 188.5 avg 203.3 max 252.4 median 202.5 stddev 11.1 | |
| Connection time [ms]: connect 45.5 | |
| Connection length [replies/conn]: 1.000 | |
| Request rate: 9.9 req/s (101.1 ms/req) |
| find_command = tree.find(nsmap['dtp']+'BOM') | |
| # return if nothign is found | |
| if find_command is None: return | |
| for sub in list(find_command): | |
| # pass if not equipment | |
| if sub.tag != nsmap['dtp']+'Equipment': pass | |
| # look for order status element | |
| find_sub = sub.find(nsmap['dtp']+'OrderStatus') |
| Total eclipse of the Moon | |
| Delta T: 67.0s | |
| TRAVERSE CITY, MICHIGAN | |
| o ' o ' | |
| W085 37, N44 46 | |
| Eastern Daylight Time | |
| Moon's |
| Total eclipse of the Moon | |
| Delta T: 67.0s | |
| FINDLAY, OHIO | |
| o ' o ' | |
| W083 38, N41 03 | |
| Eastern Daylight Time | |
| Moon's |
| find . -name 'appiniconfig.js' | | |
| while read filename; do | |
| perl -p -i.bak -e 's/ClickToEnlarge/clicktoenlarge/g' "$filename" | |
| done |