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

Git: Better wording for rebase in progress message

Browse Source 
Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-03 07:34:12 +03:00
committed by Orgad Shaneh
parent a91219c636
commit 5d39fcf7cf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/git/gitclient.cpp
View File

@@ -2313,14 +2313,14 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo
void GitClient::continueCommandIfNeeded(const QString &workingDirectory) void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
{ {
switch (checkCommandInProgress(workingDirectory)) { CommandInProgress command = checkCommandInProgress(workingDirectory);
switch (command) {
case Rebase: case Rebase:
continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"),
tr("Continue rebase?"), tr("Continue"), QLatin1String("rebase"));
break;
case RebaseMerge: case RebaseMerge:
continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"), continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"),
tr("Continue rebase?"), tr("Continue"), QLatin1String("rebase"), false); tr("Rebase is in progress. What do you want to do?"),
tr("Continue"), QLatin1String("rebase"),
command != RebaseMerge);
break; break;
case Revert: case Revert:
continuePreviousGitCommand(workingDirectory, tr("Continue Revert"), continuePreviousGitCommand(workingDirectory, tr("Continue Revert"),