X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=33bf39da50d47c672ba0a11e5714e59a660bebf8;hb=178e2f8295f04cdb781e0652b26dc3cd569bd54f;hp=8357b8d754fb83d500bc7c018221056144dc3ef7;hpb=11b174cb7b72b2f7ee35413c4682f9f85368c9e2;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 8357b8d..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
@@ -17,3 +15,17 @@
 	smtpserverport = 587
 	smtpencryption = tls
 	smtpuser = rarecactus@gmail.com
+[imap]
+        folder = "[Gmail]/Drafts"
+        host = imaps://imap.gmail.com
+        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