Merge branch 'rt/rebase-i-broken-insn-advise' into maint
commitcec5f0bf80a972caedb72ad76dd0b0c0716bf9ff
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:46 +0000 (29 16:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:46 +0000 (29 16:49 -0700)
tree08573bed3eff6425e6d674b82b7ad3565c33ef33
parentd2a4131ec43f78c808e3f2b716f6d7e22cc2589e
parent37875b4733973ba453abf30e8d48b12751797359
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
git-rebase--interactive.sh