Commit 6f0294b0 authored by Tobias Hunger's avatar Tobias Hunger Committed by Orgad Shaneh

Git: pull --rebase when appropriate

Task-number: QTCREATORBUG-8732

Change-Id: I510ac93b118e93cba591c4717cb6779d64869be1
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 0e867850
......@@ -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();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment