From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:49:46 +0000 (-0700)
Subject: Merge branch 'rt/rebase-i-broken-insn-advise' into maint
X-Git-Tag: v2.10.1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff;p=thirdparty%2Fgit.git

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
---

cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff