mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
rebase -i: improve advice on bad instruction lines
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6ebdac1bab
commit
37875b4733
|
@ -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
|
||||
}
|
||||
|
|
|
@ -1195,7 +1195,7 @@ To avoid this message, use "drop" to explicitly remove a commit.
|
|||
Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
|
||||
The possible behaviours are: ignore, warn, error.
|
||||
|
||||
You can fix this with 'git rebase --edit-todo'.
|
||||
You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
|
||||
Or you can abort the rebase with 'git rebase --abort'.
|
||||
EOF
|
||||
|
||||
|
@ -1219,7 +1219,7 @@ cat >expect <<EOF
|
|||
Warning: the command isn't recognized in the following line:
|
||||
- badcmd $(git rev-list --oneline -1 master~1)
|
||||
|
||||
You can fix this with 'git rebase --edit-todo'.
|
||||
You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
|
||||
Or you can abort the rebase with 'git rebase --abort'.
|
||||
EOF
|
||||
|
||||
|
@ -1254,7 +1254,7 @@ cat >expect <<EOF
|
|||
Warning: the SHA-1 is missing or isn't a commit in the following line:
|
||||
- edit XXXXXXX False commit
|
||||
|
||||
You can fix this with 'git rebase --edit-todo'.
|
||||
You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
|
||||
Or you can abort the rebase with 'git rebase --abort'.
|
||||
EOF
|
||||
|
||||
|
|
Loading…
Reference in a new issue