Skip to content

Commit

Permalink
rebase -i: suggest using --edit-todo to fix an unknown instruction
Browse files Browse the repository at this point in the history
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
j6t authored and gitster committed Sep 19, 2012
1 parent 9f4981b commit 9c8e101
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9c8e101

Please sign in to comment.