Permalink
Browse files

Update gitconfig

  • Loading branch information...
1 parent bb19a94 commit abaec45b2111a9f7e0fd9f74fc5e5d0765a47144 @sj26 committed Feb 10, 2013
Showing with 13 additions and 7 deletions.
  1. +13 −7 .gitconfig
View
@@ -1,13 +1,20 @@
[user]
- name = Samuel Cochran
- email = sj26@sj26.com
+ name = Samuel Cochran
+ email = sj26@sj26.com
+
[color]
- ui = auto
+ ui = auto
+
[core]
- editor = vim
- excludesfile = /Users/sj26/.gitignore
+ excludesfile = /Users/sj26/.gitignore
+
[alias]
- blame = blame --abbrev=6
+ blame = blame --abbrev=6
+
+[merge "bundleinstall"]
+ name = bundle install
+ driver = bundle install
+
[merge "railsschema"]
name = newer Rails schema version
driver = "ruby -e '\n\
@@ -18,4 +25,3 @@
end\n\
File.open(%(%A), %(w)) {|f| f.write(b)}\n\
exit 1 if b.include?(%(<)*%L)'"
-

0 comments on commit abaec45

Please sign in to comment.