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

diff --git a/.gitconfig b/.gitconfig
index 33bf39d..423382a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,3 +29,5 @@
 	pushInsteadOf = git://github.sf.cloudera.com/
 [merge]
 	conflictstyle = diff3
+[branch]
+	autosetuprebase = always