diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 11:04:58 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 17:19:01 +0900 |
commit | d421afa0c66ec6bbd15602d534f77546c516f2a5 (patch) | |
tree | 723714ec4901aeb6facf61094e98d3728631c80f /Documentation | |
parent | Git 2.20 (diff) | |
download | tgif-d421afa0c66ec6bbd15602d534f77546c516f2a5.tar.xz |
rebase: introduce --reschedule-failed-exec
A common use case for the `--exec` option is to verify that each commit
in a topic branch compiles cleanly, via `git rebase -x make <base>`.
However, when an `exec` in such a rebase fails, it is not re-scheduled,
which in this instance is not particularly helpful.
Let's offer a flag to reschedule failed `exec` commands.
Based on an idea by Paul Morelle.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/git-rebase.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index dff17b3178..174be5b1f0 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -501,6 +501,11 @@ See also INCOMPATIBLE OPTIONS below. with care: the final stash application after a successful rebase might result in non-trivial conflicts. +--reschedule-failed-exec:: +--no-reschedule-failed-exec:: + Automatically reschedule `exec` commands that failed. This only makes + sense in interactive mode (or when an `--exec` option was provided). + INCOMPATIBLE OPTIONS -------------------- |