From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 9 Feb 2019 04:44:52 +0000 (-0800)
Subject: Merge branch 'js/rebase-i-redo-exec-fix'
X-Git-Tag: v2.21.0-rc1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b966813e716504252ea26a635db21aa628e3dbd8;p=thirdparty%2Fgit.git

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"
---

b966813e716504252ea26a635db21aa628e3dbd8