Hi,
On Wed, 21 Sep 2016, Junio C Hamano wrote:
> * rt/rebase-i-broken-insn-advise (2016-09-07) 1 commit
> - rebase -i: improve advice on bad instruction lines
>
> When "git rebase -i" is given a broken instruction, it told the
> user to fix it with "--edit-todo", but didn't say what the step
> after that was (i.e. "--continue").
>
> Will hold.
> Dscho's "rebase -i" hopefully will become available in 'pu', by
> which time an equivalent of this fix would be ported to C. This is
> queued merely as a reminder.
Porting the fix was surprisingly easy:
-- snipsnap --
[PATCH] fixup! rebase -i: check for missing commits in the rebase--helper
---
sequencer.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 8f27524..386d16e 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2567,9 +2567,10 @@ int check_todo_list(void)
if (raise_error)
fprintf(stderr,
- _("You can fix this with 'git rebase --edit-todo'.\n"
- "Or you can abort the rebase with 'git rebase"
- " --abort'.\n"));
+ _("You can fix this with 'git rebase --edit-todo' "
+ "and then run 'git rebase --continue'.\n"
+ "Or you can abort the rebase with 'git rebase"
+ " --abort'.\n"));
return res;
}
--
2.10.0.windows.1.10.g803177d
