mirror of https://github.com/bjeanes/dotfiles.git
Clean up gitconfig
parent
08e32b4ef6
commit
6c55caafc3
|
@ -28,30 +28,22 @@
|
||||||
[diff "ruby"]
|
[diff "ruby"]
|
||||||
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
|
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
|
||||||
|
|
||||||
# Kaleidoscope.app
|
|
||||||
[difftool "Kaleidoscope"]
|
|
||||||
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
|
|
||||||
[difftool]
|
|
||||||
prompt = false
|
|
||||||
[diff]
|
|
||||||
tool = Kaleidoscope
|
|
||||||
|
|
||||||
# http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
|
# http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
|
||||||
[merge "bundlelock"]
|
[merge "bundlelock"]
|
||||||
name = lock Gemfile
|
name = lock Gemfile
|
||||||
driver = bundle install
|
driver = "bundle check && bundle install"
|
||||||
|
|
||||||
# http://tbaggery.com/2010/10/24/reduce-your-rails-schema-conflicts.html
|
# http://tbaggery.com/2010/10/24/reduce-your-rails-schema-conflicts.html
|
||||||
[merge "railsschema"]
|
[merge "railsschema"]
|
||||||
name = newer Rails schema version
|
name = newer Rails schema version
|
||||||
driver = "ruby -e '\n\
|
driver = "ruby -e '\n\
|
||||||
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
|
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
|
||||||
b = File.read(%(%A))\n\
|
b = File.read(%(%A))\n\
|
||||||
b.sub!(/^<+ .*\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n=+\\nActiveRecord::Schema\\.define.:version => (\\d+). do\\n>+ .*/) do\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\
|
%(ActiveRecord::Schema.define(:version => #{[$1, $2].max}) do)\n\
|
||||||
end\n\
|
end\n\
|
||||||
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
|
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
|
||||||
exit 1 if b.include?(%(<)*%L)'"
|
exit 1 if b.include?(%(<)*%L)'"
|
||||||
|
|
||||||
# https://gist.github.com/833086
|
# https://gist.github.com/833086
|
||||||
[url "git@github.com:"]
|
[url "git@github.com:"]
|
||||||
|
@ -69,6 +61,5 @@
|
||||||
[url "git@heroku.com:"]
|
[url "git@heroku.com:"]
|
||||||
insteadOf = "heroku:"
|
insteadOf = "heroku:"
|
||||||
|
|
||||||
|
|
||||||
[github]
|
[github]
|
||||||
user = bjeanes
|
user = bjeanes
|
||||||
|
|
Loading…
Reference in New Issue