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

Git: Fix pull

Browse Source 
regression from 40eecd87c9

Change-Id: Ibbf4082f9949ca25d22d7ba707281ae6652249ce
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-22 19:48:34 +02:00
committed by Tobias Hunger
parent 64018aed8a
commit 53443616e5
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/gitclient.cpp
View File

@@ -2128,7 +2128,7 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory, const
bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase) bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase)
{ {
QString abortCommand; QString abortCommand;
QStringList arguments; QStringList arguments(QLatin1String("pull"));
if (rebase) { if (rebase) {
arguments << QLatin1String("--rebase"); arguments << QLatin1String("--rebase");
abortCommand = QLatin1String("rebase"); abortCommand = QLatin1String("rebase");