mirror of https://github.com/bjeanes/dotfiles.git
Clean up gitconfig
parent
08e32b4ef6
commit
6c55caafc3
|
@ -28,18 +28,10 @@
|
|||
[diff "ruby"]
|
||||
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
|
||||
[merge "bundlelock"]
|
||||
name = lock Gemfile
|
||||
driver = bundle install
|
||||
driver = "bundle check && bundle install"
|
||||
|
||||
# http://tbaggery.com/2010/10/24/reduce-your-rails-schema-conflicts.html
|
||||
[merge "railsschema"]
|
||||
|
@ -69,6 +61,5 @@
|
|||
[url "git@heroku.com:"]
|
||||
insteadOf = "heroku:"
|
||||
|
||||
|
||||
[github]
|
||||
user = bjeanes
|
||||
|
|
Loading…
Reference in New Issue