diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-28 14:05:25 -0800 |
| commit | a90214fb857c988a9e8dff46626dc715918a9330 (patch) | |
| tree | 756c139e2481e113fa188ed55f6b2c46c153a7a3 /git-rebase.txt | |
| parent | ace33e4fa1aa5ba14bafe92218bf07dea068791f (diff) | |
| download | git-htmldocs-a90214fb857c988a9e8dff46626dc715918a9330.tar.gz | |
Autogenerated HTML docs for v2.20.1-421-g9403f
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index d284155cf..4dd5853d6 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -462,6 +462,12 @@ without an explicit `--interactive`. + See also INCOMPATIBLE OPTIONS below. +-y <cmd>:: + This is the same as passing `--reschedule-failed-exec` before + `-x <cmd>`, i.e. it appends the specified `exec` command and + turns on the mode where failed `exec` commands are automatically + rescheduled. + --root:: Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>. This allows you to rebase @@ -501,6 +507,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 -------------------- |