diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-10 19:05:01 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-11 08:19:01 (GMT) |
| commit | 81ef8ee75d5f348d3c71ff633d13d302124e1a5e (patch) | |
| tree | dfe951e0a92f21fc4d9bbe32c919f09742af392d /Documentation/git-rebase.txt | |
| parent | 969de3ff0e01282cc061892f47b5f04b22de76af (diff) | |
| download | git-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.zip git-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.tar.gz git-81ef8ee75d5f348d3c71ff633d13d302124e1a5e.tar.bz2 | |
rebase: introduce a shortcut for --reschedule-failed-exec
It is a bit cumbersome to write out the `--reschedule-failed-exec`
option before `-x <cmd>` all the time; let's introduce a convenient
option to do both at the same time: `-y <cmd>`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 174be5b..98f60b2 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/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 |