diff options
| author | Orgad Shaneh <[email protected]> | 2013-06-14 18:35:38 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2013-06-17 10:56:05 +0200 |
| commit | 096daac0bd06e4adbfd176976c586bb8fc078531 (patch) | |
| tree | 7a0290a4eebfd9f6041b8f791bc9819ed3e0d8c1 /src/plugins/git/gitclient.h | |
| parent | fc2a5d7f5064cf6eec8b2f4c7f65bc3cfdd231ce (diff) | |
Git: Execute rebase asynchronously
Rebase --continue might request an editor, which hangs if run
synchronously
Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index e6feb43866f..cf0ead6c0de 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -240,9 +240,7 @@ public: void push(const QString &workingDirectory, const QStringList &pushArgs = QStringList()); bool synchronousMerge(const QString &workingDirectory, const QString &branch); bool canRebase(const QString &workingDirectory) const; - bool synchronousRebase(const QString &workingDirectory, - const QString &baseBranch, - const QString &topicBranch = QString()); + void rebase(const QString &workingDirectory, const QString &baseBranch); bool synchronousRevert(const QString &workingDirectory, const QString &commit); bool synchronousCherryPick(const QString &workingDirectory, const QString &commit); void interactiveRebase(const QString &workingDirectory, const QString &commit, bool fixup); |