Commit 53443616 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger
Browse files

Git: Fix pull

regression from 40eecd87



Change-Id: Ibbf4082f9949ca25d22d7ba707281ae6652249ce
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 64018aed
......@@ -2128,7 +2128,7 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory, const
bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase)
{
QString abortCommand;
QStringList arguments;
QStringList arguments(QLatin1String("pull"));
if (rebase) {
arguments << QLatin1String("--rebase");
abortCommand = QLatin1String("rebase");
......
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