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

diff --git a/.gitconfig b/.gitconfig
index 8357b8d..5cd4441 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,9 +1,8 @@
 [core]
 	editor = vim
-        pager = less -FRX
-[user]
-	name = Colin Patrick McCabe
-	email = cmccabe@alumni.cmu.edu
+	pager = less -FRX
+	autocrlf = false
+    ignorecase = false
 [color]
 	branch = auto
 	status = auto
@@ -17,3 +16,23 @@
 	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
+	tool = vimdiff
+[branch]
+	autosetuprebase = always
+[user]
+	email = colin@apache.org
+	name = Colin P. McCabe