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: https://git.lorimer.id.au/gitweb.git/diff_plain/cec5f0bf80a972caedb72ad76dd0b0c0716bf9ff?ds=inline;hp=-c

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
diff --combined git-rebase--interactive.sh
index 5e474e4a85,02c9a1f3e4..ca994c5c54
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -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"