2010-06-25 14:11:53 +10:00
|
|
|
[user]
|
|
|
|
|
name = Bodaniel Jeanes
|
|
|
|
|
email = me@bjeanes.com
|
|
|
|
|
[merge]
|
|
|
|
|
summary = true
|
|
|
|
|
tool = opendiff
|
|
|
|
|
[alias]
|
|
|
|
|
co = checkout
|
|
|
|
|
put = push origin HEAD
|
|
|
|
|
push-all = "!for i in $(git config --list | grep -E ^remote\\..+\\.url | sed -E 's/^remote\\.(.*)\\.url=.*/\\1/'); do git push $i master; done"
|
|
|
|
|
unadd = reset HEAD
|
|
|
|
|
[apply]
|
|
|
|
|
whitespace = nowarn
|
|
|
|
|
[color]
|
|
|
|
|
branch = auto
|
|
|
|
|
diff = auto
|
|
|
|
|
status = auto
|
|
|
|
|
ui = auto
|
|
|
|
|
[core]
|
2011-02-21 15:51:48 +11:00
|
|
|
attributesfile = ~/.gitattributes
|
2010-06-25 14:11:53 +10:00
|
|
|
excludesfile = ~/.gitignore
|
|
|
|
|
whitespace = fix
|
|
|
|
|
[branch]
|
|
|
|
|
autosetupmerge = always
|
|
|
|
|
autosetuprebase = local
|
|
|
|
|
[push]
|
2010-11-22 14:51:59 +11:00
|
|
|
default = tracking
|
2010-06-25 14:11:53 +10:00
|
|
|
[diff "ruby"]
|
|
|
|
|
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
|
2011-02-21 15:51:48 +11:00
|
|
|
|
|
|
|
|
# Kaleidoscope.app
|
2010-11-30 01:03:26 +11:00
|
|
|
[difftool "Kaleidoscope"]
|
|
|
|
|
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
2011-02-21 15:51:48 +11:00
|
|
|
tool = Kaleidoscope
|
|
|
|
|
|
|
|
|
|
# http://bitfission.com/blog/2010/07/auto-merge-gemfile-lock.html
|
2010-11-30 01:35:37 +11:00
|
|
|
[merge "bundlelock"]
|
|
|
|
|
name = lock Gemfile
|
2011-02-21 15:51:48 +11:00
|
|
|
driver = bundle install
|
|
|
|
|
|
|
|
|
|
# http://tbaggery.com/2010/10/24/reduce-your-rails-schema-conflicts.html
|
2010-11-30 01:35:37 +11:00
|
|
|
[merge "railsschema"]
|
|
|
|
|
name = newer Rails schema version
|
|
|
|
|
driver = "ruby -e '\n\
|
|
|
|
|
system %(git), %(merge-file), %(--marker-size=%L), %(%A), %(%O), %(%B)\n\
|
|
|
|
|
b = File.read(%(%A))\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\
|
|
|
|
|
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
|
|
|
|
|
exit 1 if b.include?(%(<)*%L)'"
|
|
|
|
|
|
