[PATCH] rebase -i: improve advice on bad instruction lines
- From
Ralf Thielow <ralf.thielow@gmail.com>
- Date
- Sep 6, 2016, 18:08 UTC
- Message-ID
- <20160906180838.865-1-ralf.thielow@gmail.com>
If we found bad instruction lines in the instruction sheet of interactive rebase, we give the user advice on how to fix it. However, we don't tell the user what to do afterwards. Give the user advice to run 'git rebase --continue' after the fix.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b1ba21c..029594e 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1041,7 +1041,7 @@ The possible behaviours are: ignore, warn, error.")" # placed before the commit of the next action checkout_onto - warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")" + warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")" die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")" fi }
-- 2.10.0.304.gf2ff484