diff options
| author | Guillaume Pagès <guillaume.pages@ensimag.grenoble-inp.fr> | 2015-06-30 13:01:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-30 18:13:06 (GMT) |
| commit | df25e9475bbec86c5c8adaea1d515e7559607def (patch) | |
| tree | 450ed6e5e4258e023020a96ff1c5e1a7d48b63b4 /wt-status.c | |
| parent | 05eb5635537bac0494bfd8cf41fa5502e05b6fd6 (diff) | |
| download | git-df25e9475bbec86c5c8adaea1d515e7559607def.zip git-df25e9475bbec86c5c8adaea1d515e7559607def.tar.gz git-df25e9475bbec86c5c8adaea1d515e7559607def.tar.bz2 | |
status: differentiate interactive from non-interactive rebases
Signed-off-by: Guillaume Pagès <guillaume.pages@ensimag.grenoble-inp.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 9e0559c..d2c5c7d 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; |