X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=33bf39da50d47c672ba0a11e5714e59a660bebf8;hb=b9c73567b656eacb7fb101cbebd8c36d3e0ee7f9;hp=5c5145b779072915ec599a642b8f8f7cec501cc6;hpb=9798ee66524f411b640bcb5b302420fdfcae79d5;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 5c5145b..33bf39d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,8 +1,7 @@
 [core]
 	editor = vim
-[user]
-	name = Colin Patrick McCabe
-	email = cmccabe@alumni.cmu.edu
+        pager = less -FRX
+	autocrlf = false
 [color]
 	branch = auto
 	status = auto
@@ -12,3 +11,21 @@
 	threads = 4
 [sendemail]
 	chainreplyto = false
+	smtpserver = smtp.gmail.com
+	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