diff --git a/sequencer.c b/sequencer.c index b34c3816aa..89fd6259bc 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1346,8 +1346,12 @@ static int read_populate_todo(struct todo_list *todo_list, close(fd); res = parse_insn_buffer(todo_list->buf.buf, todo_list); - if (res) + if (res) { + if (is_rebase_i(opts)) + return error("Please fix this using " + "'git rebase --edit-todo'."); return error(_("Unusable instruction sheet: %s"), todo_file); + } if (!todo_list->nr && (!is_rebase_i(opts) || !file_exists(rebase_path_done()))) return error(_("No commits parsed."));