From 0a224c0ae6eb85ef9ad1404349732156d23c4867 Mon Sep 17 00:00:00 2001
From: Holger Just <hjust@meine-er.de>
Date: Mon, 17 Dec 2012 16:58:34 +0100
Subject: [PATCH] Always rebase on git pull

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 5cb919e..f18158d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,6 +28,6 @@
 [credential]
 	helper=osxkeychain
 [branch]
-	autosetupmerge = true
+	autosetupmerge = always
 [http]
 	postBuffer = 5242880000