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

Better cleanup of gitconfig

pull/2/head
Bodaniel Jeanes 2011-11-08 00:54:51 -06:00
parent aa072a523d
commit 112aa8a1e2
1 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
vcs/git/gitconfig
View File

@ -1,68 +1,68 @@
[user] [user]
name = Bodaniel Jeanes name = Bodaniel Jeanes
email = me@bjeanes.com email = me@bjeanes.com
[merge] [merge]
summary = true summary = true
tool = opendiff tool = opendiff
[alias] [alias]
co = checkout co = checkout
put = push origin HEAD 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" 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 unadd = reset HEAD
ctags = !.git/hooks/ctags ctags = !.git/hooks/ctags
[apply] [apply]
whitespace = nowarn whitespace = nowarn
[color] [color]
branch = auto branch = auto
diff = auto diff = auto
status = auto status = auto
ui = auto ui = auto
[core] [core]
attributesfile = ~/.gitattributes attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
whitespace = fix whitespace = fix
[branch] [branch]
autosetupmerge = always autosetupmerge = always
autosetuprebase = local autosetuprebase = local
[push] [push]
default = tracking default = tracking
[diff "ruby"] [diff "ruby"]
funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\) funcname = ^ *\\(\\(class\\|module\\|def\\) .*\\)
# 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 check && 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:"]
insteadOf = "gh:" insteadOf = "gh:"
pushInsteadOf = "github:" pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/" pushInsteadOf = "git://github.com/"
[url "git://github.com/"] [url "git://github.com/"]
insteadOf = "github:" insteadOf = "github:"
[url "git@gist.github.com:"] [url "git@gist.github.com:"]
insteadOf = "gst:" insteadOf = "gst:"
pushInsteadOf = "gist:" pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/" pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"] [url "git://gist.github.com/"]
insteadOf = "gist:" insteadOf = "gist:"
[url "git@heroku.com:"] [url "git@heroku.com:"]
insteadOf = "heroku:" insteadOf = "heroku:"
[github] [github]
user = bjeanes user = bjeanes
[init] [init]
templatedir = ~/.git_template templatedir = ~/.git_template