diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2024-01-12 10:32:20 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2024-01-13 12:57:49 +1100 |
| commit | 53a8bd2e3fbbc474bbd70564f38f6fe1e1d10079 (patch) | |
| tree | 254e5ebb4339357c7b3aeadee36b296a6a4d5cc1 /schema | |
| parent | e9962b98a761a054b9ba8c042904d8e5572e59be (diff) | |
Add ability to start an interactive rebase onto an appropriate base
A common issue I have is that I want to move a commit from the top of my branch
all the way down to the first commit on the branch. To do that, I need to navigate
down to the first commit on my branch, press 'e' to start an interactive rebase,
then navigate back up to the top of the branch, then move my commit back down to
the base. This is annoying.
Similarly annoying is moving the commit one-by-one without explicitly starting
an interactive rebase, because then each individual step is its own rebase which
takes a while in aggregate.
This PR allows you to press 'i' from the commits view to start an interactive
rebase from an 'appropriate' base. By appropriate, we mean that we want to start
from the HEAD and stop when we reach the first merge commit or commit on the main
branch. This may end up including more commits than you need, but it doesn't make
a difference.
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/config.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/schema/config.json b/schema/config.json index 1251240a1..3de7df17d 100644 --- a/schema/config.json +++ b/schema/config.json @@ -1143,6 +1143,10 @@ "viewBisectOptions": { "type": "string", "default": "b" + }, + "startInteractiveRebase": { + "type": "string", + "default": "i" } }, "additionalProperties": false, |