From: Junio C Hamano Date: Mon, 26 Sep 2016 23:09:21 +0000 (-0700) Subject: Merge branch 'rt/rebase-i-broken-insn-advise' X-Git-Tag: v2.11.0-rc0~106 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/104a93a329fdb5ea530cee4012a3023346f2a849 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 --- 104a93a329fdb5ea530cee4012a3023346f2a849