jesseduffield.lazygit/pkg/integration/tests
Jesse Duffield 53a8bd2e3f 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.
2024-01-13 12:57:49 +11:00
..
bisect Make bisect/basic.go test more concrete 2023-07-31 08:34:01 +02:00
branch Add integration test for local branch sort order 2023-12-27 15:25:29 +01:00
cherry_pick Allow cherry-picking commits during a rebase 2023-09-18 10:50:19 +02:00
commit Warn when there are hunks with only added lines 2024-01-10 09:11:40 +01:00
config Support matchers on integers in integration tests 2023-06-03 15:32:23 +10:00
conflicts Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
custom_commands Allow checking for merge conflicts after running a custom command 2023-07-13 18:40:34 +10:00
demo Add demo for diffing two commits 2023-08-12 17:24:05 +10:00
diff Add busy count for integration tests 2023-07-08 22:54:52 +10:00
file feat: introduce a copy menu into the file view 2023-12-07 08:30:03 +01:00
filter_and_search When refreshing models, re-apply active filter for the corresponding view 2023-10-10 08:37:30 +02:00
filter_by_path Pass -f as single arg in integration test 2024-01-12 20:19:50 +11:00
interactive_rebase Add ability to start an interactive rebase onto an appropriate base 2024-01-13 12:57:49 +11:00
misc fixed typo in test description 2023-10-30 14:17:34 +01:00
patch_building feat: add os.copyToClipboardCmd to allow for a custom command #1055 (#2784) 2023-07-29 19:35:52 +10:00
reflog Don't show branch heads in reflog subcommits 2023-07-31 08:34:01 +02:00
shared Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
staging Fix the title and text (and variable names) of the Discard Changes prompt 2023-06-26 08:15:35 +02:00
stash feat: add age on stash lines 2023-12-27 11:21:49 +01:00
submodule Use sentence case everywhere 2023-05-25 23:52:19 +10:00
sync Show correct keybindings in force-push prompt 2023-07-31 11:38:52 +02:00
tag Fix checking out a tag when a branch with the same name exists 2024-01-09 14:18:35 +01:00
ui If OpenLink errors, show a dialog instead 2023-08-09 13:12:40 +01:00
undo Use sentence case everywhere 2023-05-25 23:52:19 +10:00
worktree Set working directory in lazygit test command 2024-01-12 19:59:31 +11:00
test_list.go Add ability to start an interactive rebase onto an appropriate base 2024-01-13 12:57:49 +11:00
test_list_generator.go Make test_list_generator.go print what it's doing 2023-09-29 20:40:15 +02:00
tests.go Set working directory in lazygit test command 2024-01-12 19:59:31 +11:00