1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
lazygit/pkg/integration/tests/interactive_rebase
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
..
advanced_interactive_rebase.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_commit_with_conflict.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
amend_first_commit.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_fixup_commit.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_head_commit_during_rebase.go Improve prompts when amending commits 2023-09-01 18:55:16 +02:00
amend_merge.go Improve prompts when amending commits 2023-09-01 18:55:16 +02:00
amend_non_head_commit_during_rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
drop_todo_commit_with_update_ref.go Select same commit again after pressing "e" to edit a commit 2023-08-22 14:08:12 +02:00
drop_with_custom_comment_char.go Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
edit_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
edit_non_todo_commit_during_rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
edit_the_confl_commit.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
fixup_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
fixup_second_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
move_in_rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
move_with_custom_comment_char.go Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
move.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
pick_rescheduled.go Add test for a pick that fails and gets rescheduled 2023-06-22 18:57:43 +02:00
quick_start.go Add ability to start an interactive rebase onto an appropriate base 2024-01-13 12:57:49 +11:00
rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_commit_with_editor_and_fail.go Add test for rewording a commit and failing with an error 2023-06-22 18:57:43 +02:00
reword_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_last_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_you_are_here_commit_with_editor.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_you_are_here_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
shared.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
squash_down_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
squash_down_second_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
squash_fixups_above_first_commit.go Add busy count for integration tests 2023-07-08 22:54:52 +10:00
swap_in_rebase_with_conflict_and_edit.go Add a test for stopping at an "edit" command that conflicts 2023-06-22 18:57:58 +02:00
swap_in_rebase_with_conflict.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
swap_with_conflict.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00