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 /sequencer.h | |
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 'sequencer.h')
-rw-r--r-- | sequencer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 9d83f0f3e9..5d7bc04751 100644 --- a/sequencer.h +++ b/sequencer.h @@ -40,6 +40,7 @@ struct replay_opts { int allow_empty_message; int keep_redundant_commits; int verbose; + int reschedule_failed_exec; int mainline; |