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)
commitb966813e716504252ea26a635db21aa628e3dbd8
tree9e1164f754db4e0b9b793d7cd79eb4d285279e5f
parent87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4
parente11ff8975bedc0aae82632c3cb72578c3d7fc0b2
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"
Documentation/git-rebase.txt
builtin/rebase.c
git-legacy-rebase.sh