From: Colin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Date: Wed, 15 Oct 2014 23:16:22 +0000 (-0700)
Subject: .gitconfig: use autosetuprebase = always
X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81ace032db766ab21b58e5c5244faecbd06d7c54;p=cmccabe-etc

.gitconfig: use autosetuprebase = always

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
---

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