diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 12:47:53 -0800 |
| commit | d9d9ab0876e5ba82996852e7033b2fb29c970914 (patch) | |
| tree | cc49fab5940cb3370d3c701d46589c055a0bb1c5 /Documentation/config | |
| parent | Merge branch 'cc/fetch-error-message-fix' (diff) | |
| parent | rebase: introduce a shortcut for --reschedule-failed-exec (diff) | |
| download | tgif-d9d9ab0876e5ba82996852e7033b2fb29c970914.tar.xz | |
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 'Documentation/config')
| -rw-r--r-- | Documentation/config/rebase.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt index f079bf6b7e..331d250e04 100644 --- a/Documentation/config/rebase.txt +++ b/Documentation/config/rebase.txt @@ -64,3 +64,8 @@ instead of: ------------------------------------------- + Defaults to false. + +rebase.rescheduleFailedExec:: + Automatically reschedule `exec` commands that failed. This only makes + sense in interactive mode (or when an `--exec` option was provided). + This is the same as specifying the `--reschedule-failed-exec` option. |