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

..

fetch_and_auto_forward_branches_all_branches_checked_out_in_other_worktree.go

…

fetch_and_auto_forward_branches_all_branches.go

…

fetch_and_auto_forward_branches_none.go

…

fetch_and_auto_forward_branches_only_main_branches.go

…

fetch_and_auto_forward_branches_worktree_added_after_startup.go

…

fetch_prune.go

…

fetch_when_sorted_by_date.go

…

force_push_multiple_matching.go

…

force_push_multiple_upstream.go

…

force_push_remote_branch_not_stored_locally.go

…

force_push_triangular.go

…

force_push.go

…

pull_and_set_upstream.go

…

pull_merge_conflict.go

…

pull_merge.go

…

pull_rebase_conflict.go

…

pull_rebase_interactive_conflict_drop.go

…

pull_rebase_interactive_conflict.go

…

pull_rebase.go

…

pull.go

…

push_and_auto_set_upstream.go

…

push_and_set_upstream.go

…

push_follow_tags.go

…

push_no_follow_tags.go

…

push_tag.go

…

push_with_credential_prompt.go

…

push.go

…

rename_branch_and_pull.go

…

shared.go

…