bo
/
dotfiles
mirror of https://github.com/bjeanes/dotfiles.git
1
0
Fork 0
Code Releases Activity

Clean up gitconfig

pull/2/head
Bodaniel Jeanes 2011-11-08 00:36:44 -06:00
parent 08e32b4ef6
commit 6c55caafc3
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vcs/git/gitconfig
View File

@ -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