X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=33bf39da50d47c672ba0a11e5714e59a660bebf8;hb=9ea907f68e1c7ee952cdee58dc9c7a91bcfce730;hp=2f29caedb1dd099fb28bbbddc6756fb0b774ee32;hpb=da339286f49bbd4897603290672c7c065068f95f;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 2f29cae..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
@@ -24,4 +22,10 @@
         port = 993
         sslverify = false
 [push]
-        default = matching
+	default = current
+[reviewboard] 
+	url = http://review.sf.cloudera.com/ 
+[url "git@github.sf.cloudera.com:"]
+	pushInsteadOf = git://github.sf.cloudera.com/
+[merge]
+	conflictstyle = diff3