From df25e9475bbec86c5c8adaea1d515e7559607def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20Pag=C3=A8s?= Date: Tue, 30 Jun 2015 15:01:13 +0200 Subject: status: differentiate interactive from non-interactive rebases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Pagès Signed-off-by: Junio C Hamano Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- wt-status.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'wt-status.c') diff --git a/wt-status.c b/wt-status.c index 9e0559c0c8..d2c5c7d41a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1327,7 +1327,10 @@ void wt_status_print(struct wt_status *s) else if (!strcmp(branch_name, "HEAD")) { branch_status_color = color(WT_STATUS_NOBRANCH, s); if (state.rebase_in_progress || state.rebase_interactive_in_progress) { - on_what = _("rebase in progress; onto "); + if (state.rebase_interactive_in_progress) + on_what = _("interactive rebase in progress; onto "); + else + on_what = _("rebase in progress; onto "); branch_name = state.onto; } else if (state.detached_from) { branch_name = state.detached_from; -- cgit v1.2.1