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

Git: Run continue command asynchronously

Browse Source 
Git might request an editor on continue

Change-Id: I374e9889e32ea1b1b5ed04f9be9d2a829f3b6440
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-02-28 13:26:59 +02:00
committed by Orgad Shaneh
parent a195ec5298
commit cc3f1ad07d
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/git/gitclient.h
View File

@@ -197,7 +197,6 @@ public:
QString vcsGetRepositoryURL(const QString &directory);
bool synchronousFetch(const QString &workingDirectory, const QString &remote);
bool synchronousPull(const QString &workingDirectory, bool rebase);
bool synchronousCommandContinue(const QString &workingDirectory, const QString &command, bool hasChanges);
bool synchronousPush(const QString &workingDirectory, const QString &remote = QString());
bool synchronousMerge(const QString &workingDirectory, const QString &branch);
bool synchronousRebase(const QString &workingDirectory,