Permalink
Browse files

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>
  • Loading branch information...
1 parent 9f4981b commit 9c8e1011b9f6979777946ff87aae7b5846ed20a7 @j6t j6t committed with gitster Sep 19, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 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

0 comments on commit 9c8e101

Please sign in to comment.