From ba7dc453a228fa874ef4290ef3d45cb435225e2a Mon Sep 17 00:00:00 2001
From: Holger Just <hjust@meine-er.de>
Date: Wed, 8 May 2013 18:59:41 +0200
Subject: [PATCH] Always pull with --rebase

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

diff --git a/.gitconfig b/.gitconfig
index 8d453ea..d3f92c6 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -4,7 +4,7 @@
 	st = status
 	co = checkout
 	merge = merge --no-ff
-	pull = pull --no-ff
+	pull = pull --rebase
 	ci = commit
 	cm = commit
 	p = push