diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 11:05:01 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-12-11 17:19:01 +0900 |
| commit | 81ef8ee75d5f348d3c71ff633d13d302124e1a5e (patch) | |
| tree | dfe951e0a92f21fc4d9bbe32c919f09742af392d /git-legacy-rebase.sh | |
| parent | rebase: add a config option to default to --reschedule-failed-exec (diff) | |
| download | tgif-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.tar.xz | |
rebase: introduce a shortcut for --reschedule-failed-exec
It is a bit cumbersome to write out the `--reschedule-failed-exec`
option before `-x <cmd>` all the time; let's introduce a convenient
option to do both at the same time: `-y <cmd>`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-legacy-rebase.sh')
| -rwxr-xr-x | git-legacy-rebase.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh index 37db5a7ca4..3bb0682db5 100755 --- a/git-legacy-rebase.sh +++ b/git-legacy-rebase.sh @@ -26,6 +26,7 @@ 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 @@ -262,6 +263,11 @@ 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 ;; |