diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-03 07:34:12 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-03 10:41:30 +0200 |
| commit | 5d39fcf7cfe353d442a591290c5ecf843ec1d911 (patch) | |
| tree | c678b17906815488144452ffa5b4be57144f55a9 /src | |
| parent | a91219c6363dc2dcc062a984b67dcf46085aca30 (diff) | |
| download | qt-creator-5d39fcf7cfe353d442a591290c5ecf843ec1d911.tar.gz | |
Git: Better wording for rebase in progress message
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index f51d2f6d8b..a9d42f0247 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2313,14 +2313,14 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo void GitClient::continueCommandIfNeeded(const QString &workingDirectory) { - switch (checkCommandInProgress(workingDirectory)) { + CommandInProgress command = checkCommandInProgress(workingDirectory); + switch (command) { case Rebase: - continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"), - tr("Continue rebase?"), tr("Continue"), QLatin1String("rebase")); - break; case RebaseMerge: 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; case Revert: continuePreviousGitCommand(workingDirectory, tr("Continue Revert"), |