diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-08 20:44:52 -0800 |
| commit | b966813e716504252ea26a635db21aa628e3dbd8 (patch) | |
| tree | 9e1164f754db4e0b9b793d7cd79eb4d285279e5f /Documentation/git-rebase.txt | |
| parent | 87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4 (diff) | |
| parent | e11ff8975bedc0aae82632c3cb72578c3d7fc0b2 (diff) | |
| download | git-b966813e716504252ea26a635db21aa628e3dbd8.tar.gz | |
Merge branch 'js/rebase-i-redo-exec-fix'
For "rebase -i --reschedule-failed-exec", we do not want the "-y"
shortcut after all.
* js/rebase-i-redo-exec-fix:
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 7e695b30e4..daa16403ec 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 |