diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-29 23:47:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 23:47:53 +0300 |
| commit | d9d9ab0876e5ba82996852e7033b2fb29c970914 (patch) | |
| tree | cc49fab5940cb3370d3c701d46589c055a0bb1c5 /builtin/rebase--interactive.c | |
| parent | 61c51acf7d2e01b968745aaa53de877135be28ec (diff) | |
| parent | 81ef8ee75d5f348d3c71ff633d13d302124e1a5e (diff) | |
Merge branch 'js/rebase-i-redo-exec'
"git rebase -i" learned to re-execute a command given with 'exec'
to run after it failed the last time.
* js/rebase-i-redo-exec:
rebase: introduce a shortcut for --reschedule-failed-exec
rebase: add a config option to default to --reschedule-failed-exec
rebase: introduce --reschedule-failed-exec
Diffstat (limited to 'builtin/rebase--interactive.c')
| -rw-r--r-- | builtin/rebase--interactive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c index dd2a55ab1d..c2c2d51a3b 100644 --- a/builtin/rebase--interactive.c +++ b/builtin/rebase--interactive.c @@ -193,6 +193,8 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) OPT_STRING(0, "onto-name", &onto_name, N_("onto-name"), N_("onto name")), OPT_STRING(0, "cmd", &cmd, N_("cmd"), N_("the command to run")), OPT_RERERE_AUTOUPDATE(&opts.allow_rerere_auto), + OPT_BOOL(0, "reschedule-failed-exec", &opts.reschedule_failed_exec, + N_("automatically re-schedule any `exec` that fails")), OPT_END() }; |