Commit 5d39fcf7 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Better wording for rebase in progress message



Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507
Reviewed-by: default avatarPetar Perisin <petar.perisin@gmail.com>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent a91219c6
......@@ -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"),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment