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>
Johannes Sixt committed
Sep 19, 2012 at 08:43 UTC
9c8e1011b9f6979777946ff87aae7b5846ed20a7
1 file changed
+3
-2
git-rebase--interactive.sh
+3
-2
@@ -575,11 +575,12 @@ do_next () {
575
;;
576
*)
577
warn "Unknown command: $command $sha1 $rest"
578
+ fixtodo="Please fix this using 'git rebase --edit-todo'."
579
if git rev-parse --verify -q "$sha1" >/dev/null
580
then
580
- die_with_patch $sha1 "Please fix this in the file $todo."
581
+ die_with_patch $sha1 "$fixtodo"
582
else
582
- die "Please fix this in the file $todo."
583
+ die "$fixtodo"
584
fi
585
;;
586
esac