X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=f71b8319eb6daabf9a72fb12afff8343e243f1f3;hb=HEAD;hp=70ae5b59928977685f17c33965f820c764a4f661;hpb=755b1a17607467880f58182aed7689d1228e9b7a;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 70ae5b5..f71b831 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,8 @@
 [core]
 	editor = vim
-        pager = less -FRX
+	pager = less -FRX
+	autocrlf = false
+    ignorecase = false
 [color]
 	branch = auto
 	status = auto
@@ -15,14 +17,22 @@
 	smtpencryption = tls
 	smtpuser = rarecactus@gmail.com
 [imap]
-        folder = "[Gmail]/Drafts"
-        host = imaps://imap.gmail.com
-        user = rarecactus@gmail.com
-        port = 993
-        sslverify = false
+	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/
+#[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 = cmccabe@apache.org
+	name = Colin P. McCabe