From 6f0294b03d8cebd3921b21675608cbcc3c337c14 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Thu, 14 Feb 2013 14:10:25 +0100
Subject: [PATCH] Git: pull --rebase when appropriate

Task-number: QTCREATORBUG-8732

Change-Id: I510ac93b118e93cba591c4717cb6779d64869be1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/gitplugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 3124f0d2304..a609bf45d44 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -949,7 +949,7 @@ void GitPlugin::pull()
     GitClient::StashGuard stashGuard(state.topLevel(), QLatin1String("Pull"));
     if (stashGuard.stashingFailed(false) || (rebase && (stashGuard.result() == GitClient::NotStashed)))
         return;
-    if (!m_gitClient->synchronousPull(state.topLevel(), false))
+    if (!m_gitClient->synchronousPull(state.topLevel(), rebase))
         stashGuard.preventPop();
 }