X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=6a1d62a760e05ac45e797e57e7d73e4416443406;hb=766ea174975632397ad16d90321941f2c2db6bf8;hp=423382a9e1e058879670df300ff93650852885c6;hpb=81ace032db766ab21b58e5c5244faecbd06d7c54;p=cmccabe-etc

diff --git a/.gitconfig b/.gitconfig
index 423382a..6a1d62a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [core]
 	editor = vim
-        pager = less -FRX
+	pager = less -FRX
 	autocrlf = false
 [color]
 	branch = auto
@@ -16,18 +16,19 @@
 	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