Skip to content


Subversion checkout URL

You can clone with
Download ZIP
branch: master
Fetching contributors…

Cannot retrieve contributors at this time

39 lines (31 sloc) 1.013 kb
name = Samuel Cochran
email =
blame = blame --abbrev=6
to-deploy = log --merges --grep='pull request' --format='%s (%cN)' origin/production..origin/master
ff = -c "merge.defaultToUpstream=true" merge --ff-only
fff = pull --ff-only
ui = auto
ui = auto,dense
submodule = log
default = simple
[merge "bundleinstall"]
name = bundle install
driver = bundle install
[merge "railsschema"]
name = newer Rails schema version
driver = "ruby -e '\n\
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
b =\n\
b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n>+ .*/) do\n\
%(ActiveRecord::Schema.define(:version => #{[$1, $2].max}) do)\n\
end\n\, %(w)) {|f| f.write(b)}\n\
exit 1 if b.include?(%(<)*%L)'"
[url ""]
insteadOf =
Jump to Line
Something went wrong with that request. Please try again.