summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt6
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 98f60b2be0..174be5b1f0 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -462,12 +462,6 @@ 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