From 46ec875669785ce5b0a4083ab47d426a0f409292 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Fri, 16 Mar 2012 10:51:25 +0000
Subject: [PATCH] always rebase when doing a `git pull`

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gitconfig b/gitconfig
index 2611502..530f05d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -29,3 +29,5 @@
   sub = submodule
   unstage = reset HEAD --
   last = log -1 HEAD
+[branch]
+  autosetuprebase = always