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

diff --git a/.gitconfig b/.gitconfig
index ad7aa8f..423382a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,7 @@
 [core]
 	editor = vim
         pager = less -FRX
+	autocrlf = false
 [color]
 	branch = auto
 	status = auto
@@ -22,3 +23,11 @@
         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
+[branch]
+	autosetuprebase = always