From 81ef8ee75d5f348d3c71ff633d13d302124e1a5e Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 10 Dec 2018 11:05:01 -0800 Subject: rebase: introduce a shortcut for --reschedule-failed-exec It is a bit cumbersome to write out the `--reschedule-failed-exec` option before `-x ` all the time; let's introduce a convenient option to do both at the same time: `-y `. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 174be5b1f0..98f60b2be0 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 :: + This is the same as passing `--reschedule-failed-exec` before + `-x `, 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 , instead of limiting them with an . This allows you to rebase -- cgit v1.3