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

Git: Do not hang on Continue Cherry-Pick/Revert

Browse Source 
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-12-23 09:32:59 +02:00
committed by Orgad Shaneh
parent 3330b695fa
commit df9299fd24
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,7 +254,11 @@ public:
bool synchronousMerge(const QString &workingDirectory, const QString &branch,
bool allowFastForward = true);
bool canRebase(const QString &workingDirectory) const;
void rebase(const QString &workingDirectory, const QString &baseBranch);
void rebase(const QString &workingDirectory, const QString &argument);
void cherryPick(const QString &workingDirectory, const QString &argument);
void revert(const QString &workingDirectory, const QString &argument);
void asyncCommand(const QString &workingDirectory, const QStringList &arguments,
bool hasProgress = false);
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);