| $stack, $draws = [], {} | |
| def method_missing *args | |
| return if args[0][/^to_/] | |
| $stack << args.map { |a| a or $stack.pop } | |
| $draws[$stack.pop(2)[0][0]] = args[1] if args[0] == :< | |
| end | |
| class Array | |
| def +@ |
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:
| #!/bin/sh -x | |
| # remerge <onto> [<merge_commit>] | |
| # e.g.: remerge origin/trunk | |
| # merge_commit defaults to HEAD | |
| onto=$1 | |
| mc=${2:-HEAD} | |
| mc_sha=$(git rev-parse $mc) # original merge commit | |
| p1_sha=$(git rev-parse $onto) # what we want its new first parent to be |
| cassettes |
| # The latest version of this script is now available at | |
| # https://github.com/jasoncodes/dotfiles/blob/master/aliases/rbenv.sh | |
| VERSION=1.9.3-p286 | |
| brew update | |
| brew install rbenv ruby-build rbenv-vars readline ctags | |
| if [ -n "${ZSH_VERSION:-}" ]; then | |
| echo 'eval "$(rbenv init - --no-rehash)"' >> ~/.zshrc | |
| else | |
| echo 'eval "$(rbenv init - --no-rehash)"' >> ~/.bash_profile |
| # A simple app that implements a naive session-based login, to demonstrate the problems with testing sessions in Sinatra. | |
| require 'rubygems' | |
| require 'sinatra/base' | |
| class LoginApp < Sinatra::Base | |
| enable :sessions | |
| get '/' do |
