X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=33bf39da50d47c672ba0a11e5714e59a660bebf8;hb=b8894ee8099d469c3aa120e76bc11152f9001503;hp=58415245115d73535f9e05c5938fd05e5c6667bd;hpb=dedd3b7b70a0a18cfb8949a478fe5f433ad3d5cf;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 5841524..33bf39d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,9 +1,7 @@
 [core]
 	editor = vim
         pager = less -FRX
-[user]
-	name = Colin Patrick McCabe
-	email = cmccabe@alumni.cmu.edu
+	autocrlf = false
 [color]
 	branch = auto
 	status = auto
@@ -23,3 +21,11 @@
         user = rarecactus@gmail.com
         port = 993
         sslverify = false
+[push]
+	default = current
+[reviewboard] 
+	url = http://review.sf.cloudera.com/ 
+[url "git@github.sf.cloudera.com:"]
+	pushInsteadOf = git://github.sf.cloudera.com/
+[merge]
+	conflictstyle = diff3