Stefan Haller 1c17ee1a92 Auto-select the conflicted commit when stopping in rebase ... When a rebase (or multi-commit cherry-pick or revert) stops with a conflict, it is often useful to look at the diff of the "<-- CONFLICT" commit to double-check that the conflict resolution matches the diff of the original commit. To make that easier, select that commit automatically.		2026-08-15 15:24:36 +02:00
..
advanced_interactive_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
amend_commit_with_conflict.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
amend_first_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
amend_fixup_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
amend_head_commit_during_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +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	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
delete_update_ref_todo.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
dont_show_branch_heads_for_todo_items.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
drag_keeps_selection_highlighted.go	Drag selected commits to a new position	2026-07-31 08:37:28 +02:00
drag_to_reorder.go	Cancel commit drags with escape	2026-07-31 08:37:28 +02:00
drag_to_reorder_in_rebase.go	Drag selected commits to a new position	2026-07-31 08:37:28 +02:00
drag_to_reorder_with_autoscroll.go	Keep scrolling while commits are dragged at an edge	2026-07-31 08:37:28 +02:00
drop_commit_in_copied_branch_with_update_ref.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
drop_merge_commit.go	Use more widely-supported Unicode symbols for the commit graph	2026-05-04 13:06:29 +02:00
drop_todo_commit_with_update_ref.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
drop_with_custom_comment_char.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
edit_and_auto_amend.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_first_commit.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_last_commit_of_stacked_branch.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_non_todo_commit_during_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_range_select_down_to_merge_outside_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_range_select_outside_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
edit_the_confl_commit.go	Add selection assertions to tests involving conflicts	2026-08-15 15:24:15 +02:00
fixup_first_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
fixup_keep_message.go	Support using the selected commit's message in a fixup	2026-01-28 10:28:52 +01:00
fixup_keep_message_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
fixup_second_commit.go	Support using the selected commit's message in a fixup	2026-01-28 10:28:52 +01:00
interactive_rebase_of_copied_branch.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
interactive_rebase_with_conflict_for_edit_command.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
mid_rebase_range_select.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
move.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
move_across_branch_boundary_outside_rebase.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
move_in_rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
move_todo_down_with_rapid_keypresses.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
move_update_ref_todo.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
move_with_custom_comment_char.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
outside_rebase_range_select.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
pick_rescheduled.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
quick_start.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
quick_start_keep_selection.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
quick_start_keep_selection_range.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
rebase.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
rebase_with_commit_that_becomes_empty.go	Add test for a special situation in rebases involving empty commits	2025-04-20 15:53:17 +02:00
revert_during_rebase_when_stopped_on_edit.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
revert_multiple_commits_in_interactive_rebase.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
revert_single_commit_in_interactive_rebase.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
reword_commit_with_editor_and_fail.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
reword_first_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
reword_last_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
reword_last_commit_of_stacked_branch.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
reword_merge_commit.go	Use more widely-supported Unicode symbols for the commit graph	2026-05-04 13:06:29 +02:00
reword_you_are_here_commit.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
reword_you_are_here_commit_with_editor.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
shared.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
show_exec_todos.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00
squash_down_first_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
squash_down_second_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
squash_fixups_above.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
squash_fixups_above_first_commit.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
squash_fixups_in_current_branch.go	Make integration tests using commits more robust	2026-07-09 11:56:27 +02:00
swap_in_rebase_with_conflict.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
swap_in_rebase_with_conflict_and_edit.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
swap_with_conflict.go	Auto-select the conflicted commit when stopping in rebase	2026-08-15 15:24:36 +02:00
view_files_of_todo_entries.go	Change list section headers to a slightly more elegant design	2026-07-31 08:03:40 +02:00