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

1  2 
git-rebase--interactive.sh
index 5e474e4a8584fc8ccfc7a638f9fb7a3e98f2c1e3,02c9a1f3e4cfd80609df37a7820d4cb5c27a773f..ca994c5c545cb0394fc5d355ecb6ea2fe5f1f193
@@@ -1041,7 -1041,7 +1041,7 @@@ The possible behaviours are: ignore, wa
                # 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
  }
@@@ -1082,7 -1082,7 +1082,7 @@@ If they are meant to go into a new comm
  
    git commit \$gpg_sign_opt_quoted
  
 -In both case, once you're done, continue with:
 +In both cases, once you're done, continue with:
  
    git rebase --continue
  ")"
@@@ -1141,6 -1141,9 +1141,6 @@@ To continue rebase after editing, run
        ;;
  esac
  
 -git var GIT_COMMITTER_IDENT >/dev/null ||
 -      die "$(gettext "You need to set your committer info first")"
 -
  comment_for_reflog start
  
  if test ! -z "$switch_to"