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

Git: Refactored "synchronousPullOrRebase" to be more general.

Browse Source 
This can ease adding commands that can cause conflicts like cherry-pick,
revert, merge, rebase, stash pop ...

Change-Id: Id9df7f11307dbbcb60036a20a2c22c5097ba239f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-01-08 00:17:18 +01:00
committed by Tobias Hunger
parent ff288af50b
commit 40eecd87c9
3 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.cpp
View File

@@ -267,7 +267,7 @@ void MergeTool::done()
if (QMessageBox::question(0, tr("Continue Rebase"),
tr("Continue rebase?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes) {
client->synchronousRebaseContinue(workingDirectory);
client->synchronousCommandContinue(workingDirectory, QLatin1String("rebase"));
}
}
} else {