diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-29 16:49:46 -0700 |
| commit | cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff (patch) | |
| tree | 08573bed3eff6425e6d674b82b7ad3565c33ef33 /git-rebase--interactive.sh | |
| parent | d2a4131ec43f78c808e3f2b716f6d7e22cc2589e (diff) | |
| parent | 37875b4733973ba453abf30e8d48b12751797359 (diff) | |
| download | git-cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff.tar.gz git-cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff.tar.xz | |
Merge branch 'rt/rebase-i-broken-insn-advise' into maint
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 } |