Merge branch 'rt/rebase-i-broken-insn-advise'
commit104a93a329fdb5ea530cee4012a3023346f2a849
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:21 +0000 (26 16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Sep 2016 23:09:21 +0000 (26 16:09 -0700)
tree056870b5e3c51f19b7941580abfe67306b61194b
parente683f17e6319b461def179b84d20dbcca546018a
parent37875b4733973ba453abf30e8d48b12751797359
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
git-rebase--interactive.sh