Merge branch 'js/rebase-i-redo-exec-fix'

For "rebase -i --reschedule-failed-exec", we do not want the "-y"
shortcut after all.

* js/rebase-i-redo-exec-fix:
  Revert "rebase: introduce a shortcut for --reschedule-failed-exec"

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc builtin/rebase.c
Simple merge

diff --cc git-legacy-rebase.sh
Simple merge