diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-26 16:09:21 -0700 |
| commit | 104a93a329fdb5ea530cee4012a3023346f2a849 (patch) | |
| tree | 056870b5e3c51f19b7941580abfe67306b61194b /git-rebase--interactive.sh | |
| parent | e683f17e6319b461def179b84d20dbcca546018a (diff) | |
| parent | 37875b4733973ba453abf30e8d48b12751797359 (diff) | |
| download | git-104a93a329fdb5ea530cee4012a3023346f2a849.tar.gz git-104a93a329fdb5ea530cee4012a3023346f2a849.tar.xz | |
Merge branch 'rt/rebase-i-broken-insn-advise'
When "git rebase -i" is given a broken instruction, it told the
user to fix it with "--edit-todo", but didn't say what the step
after that was (i.e. "--continue").
* rt/rebase-i-broken-insn-advise:
rebase -i: improve advice on bad instruction lines
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 5e474e4a8..ca994c5c5 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 } |