From 5d39fcf7cfe353d442a591290c5ecf843ec1d911 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 3 Jun 2013 07:34:12 +0300
Subject: [PATCH] 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>
---
 src/plugins/git/gitclient.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index f51d2f6d8b7..a9d42f02479 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"),