feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: pull --rebase when appropriate

Browse Source 
Task-number: QTCREATORBUG-8732

Change-Id: I510ac93b118e93cba591c4717cb6779d64869be1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2013-02-14 14:10:25 +01:00
committed by Orgad Shaneh
parent 0e86785019
commit 6f0294b03d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitplugin.cpp
View File

@@ -949,7 +949,7 @@ void GitPlugin::pull()
GitClient::StashGuard stashGuard(state.topLevel(), QLatin1String("Pull")); GitClient::StashGuard stashGuard(state.topLevel(), QLatin1String("Pull"));
if (stashGuard.stashingFailed(false) || (rebase && (stashGuard.result() == GitClient::NotStashed))) if (stashGuard.stashingFailed(false) || (rebase && (stashGuard.result() == GitClient::NotStashed)))
return; return;
if (!m_gitClient->synchronousPull(state.topLevel(), false)) if (!m_gitClient->synchronousPull(state.topLevel(), rebase))
stashGuard.preventPop(); stashGuard.preventPop();
} }