diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2012-09-19 08:43:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-19 12:52:10 -0700 |
| commit | 9c8e1011b9f6979777946ff87aae7b5846ed20a7 (patch) | |
| tree | d6fcec2900fdfab3a75aa5a20a5481e293b02c92 /git-rebase--interactive.sh | |
| parent | 9f4981bac6f492d332785b8ed03f33a167952f38 (diff) | |
| download | git-9c8e1011b9f6979777946ff87aae7b5846ed20a7.tar.gz | |
rebase -i: suggest using --edit-todo to fix an unknown instruction
We have now an explicit UI to edit the todo sheet and need not disclose
the name of the file.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 2b8f2a9f42..4b2ef11e59 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -575,11 +575,12 @@ do_next () { ;; *) warn "Unknown command: $command $sha1 $rest" + fixtodo="Please fix this using 'git rebase --edit-todo'." if git rev-parse --verify -q "$sha1" >/dev/null then - die_with_patch $sha1 "Please fix this in the file $todo." + die_with_patch $sha1 "$fixtodo" else - die "Please fix this in the file $todo." + die "$fixtodo" fi ;; esac |