From 81ace032db766ab21b58e5c5244faecbd06d7c54 Mon Sep 17 00:00:00 2001
From: Colin Patrick Mccabe <cmccabe@alumni.cmu.edu>
Date: Wed, 15 Oct 2014 16:16:22 -0700
Subject: [PATCH] .gitconfig: use autosetuprebase = always

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
---
 .gitconfig |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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
-- 
1.6.6.rc1.39.g9a42