Merge branch 'js/rebase-i-redo-exec-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)
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"

1  2 
Documentation/git-rebase.txt
builtin/rebase.c
git-legacy-rebase.sh

Simple merge
Simple merge
Simple merge