diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
| commit | b966813e716504252ea26a635db21aa628e3dbd8 (patch) | |
| tree | 9e1164f754db4e0b9b793d7cd79eb4d285279e5f /git-legacy-rebase.sh | |
| parent | 87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4 (diff) | |
| parent | e11ff8975bedc0aae82632c3cb72578c3d7fc0b2 (diff) | |
| download | git-b966813e716504252ea26a635db21aa628e3dbd8.tar.gz | |
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"
Diffstat (limited to 'git-legacy-rebase.sh')
| -rwxr-xr-x | git-legacy-rebase.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index 8d6c9aca65..5c2c4e5276 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -26,7 +26,6 @@ f,force-rebase! cherry-pick all commits, even if unchanged m,merge! use merging strategies to rebase i,interactive! let the user edit the list of commits to rebase x,exec=! add exec lines after each commit of the editable list -y=! same as --reschedule-failed-exec -x k,keep-empty preserve empty commits during rebase allow-empty-message allow rebasing commits with empty messages stat! display a diffstat of what changed upstream @@ -261,11 +260,6 @@ do cmd="${cmd}exec ${1#--exec=}${LF}" test -z "$interactive_rebase" && interactive_rebase=implied ;; - -y*) - reschedule_failed_exec=--reschedule-failed-exec - cmd="${cmd}exec ${1#-y}${LF}" - test -z "$interactive_rebase" && interactive_rebase=implied - ;; --interactive) interactive_rebase=explicit ;; |