tree 9e1164f754db4e0b9b793d7cd79eb4d285279e5f
parent 87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4
parent e11ff8975bedc0aae82632c3cb72578c3d7fc0b2
author Junio C Hamano <gitster@pobox.com> 1549687492 -0800
committer Junio C Hamano <gitster@pobox.com> 1549687492 -0800

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"