Stefan HallerandClaude Opus 5 78dc65cbeb Fast-forward branches whose upstream branch was rewritten ...

When somebody else rebases a branch and force-pushes it, the local
branch is left diverged from it, so `f` refuses to touch it. To get back
in sync, the branch has to be checked out and pulled, and for a stack of
branches that means doing it once per branch.

Such a branch has none of its own work in it, though: the commits it is
ahead by are the old versions of the ones that are now on the remote
branch. So when the branch has diverged and none of the commits it is
ahead by is ours, reset it to its upstream instead of refusing. This is
the same state that checking the branch out and pulling it would produce,
as rebase drops commits that the upstream already has.

A branch that isn't checked out anywhere is reset with the same
`git update-ref` that a fast-forward uses. One that is checked out
somewhere is reset with `git reset --keep`, and only when that worktree
has no changes to tracked files, so that the files under the user's feet
change no more than they have to. `--keep` also refuses to overwrite an
untracked file that the reset would bring in, which `--hard` would do
silently.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

2026-09-27 11:00:36 +02:00

..

helpers

Fast-forward branches whose upstream branch was rewritten

2026-09-27 11:00:36 +02:00

attach.go

…

base_controller.go

…

basic_commits_controller.go

Avoid appending to an array literal

2026-08-16 16:35:11 +02:00

bisect_controller.go

…

branches_controller.go

Fast-forward branches whose upstream branch was rewritten

2026-09-27 11:00:36 +02:00

command_log_controller.go

…

commit_description_controller.go

…

commit_message_controller.go

…

commits_files_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

common.go

…

confirmation_controller.go

…

context_lines_controller.go

…

custom_patch_options_menu_action.go

…

diff_paths_test.go

Collapse the paths of a moved directory into the directory itself

2026-08-17 09:32:30 +02:00

diff_paths.go

Collapse the paths of a moved directory into the directory itself

2026-08-17 09:32:30 +02:00

diffing_menu_action.go

…

edit_config_action.go

…

files_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

filter_controller.go

Filter a menu by typing into it

2026-08-31 20:41:22 +02:00

filtering_menu_action.go

Handle entering and leaving filtering mode in one place

2026-08-05 17:29:20 +02:00

git_flow_controller.go

…

global_controller.go

Move re-rendering the main view after a diff renderer change to a helper

2026-09-27 08:09:45 +02:00

jump_to_side_window_controller.go

…

list_controller_trait.go

…

list_controller.go

Scroll the selection into view by default

2026-08-14 08:04:13 +02:00

local_commits_controller_test.go

…

local_commits_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

main_view_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

menu_controller.go

Point the note about the menu's essential keys at what it means

2026-08-31 20:41:22 +02:00

menu_key.go

…

merge_conflicts_controller.go

…

options_menu_action.go

Filter the keybindings menu as you type

2026-08-31 20:41:22 +02:00

patch_building_controller.go

Let OnUIThreadAndWait's error be about the wait, not about f

2026-08-12 11:04:53 +02:00

patch_explorer_controller_test.go

…

patch_explorer_controller.go

…

prompt_controller.go

…

quit_actions.go

…

reflog_commits_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

remote_branches_controller.go

…

remotes_controller_test.go

…

remotes_controller.go

…

rename_similarity_threshold_controller.go

…

screen_mode_actions.go

…

scroll_off_margin_test.go

…

scroll_off_margin.go

…

search_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

search_prompt_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

shell_command_action.go

…

side_window_controller.go

…

snake_controller.go

…

staging_controller.go

…

stash_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

status_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

sub_commits_controller.go

…

submodules_controller.go

Extract a single helper for the paths a node's diff is limited to

2026-08-17 09:32:30 +02:00

suggestions_controller.go

Drop the highlight fixups the context stack now makes unnecessary

2026-09-03 21:19:04 +02:00

switch_to_diff_files_controller.go

…

switch_to_focused_main_view_controller.go

…

switch_to_sub_commits_controller.go

…

sync_controller.go

Offer to push the branches stacked below the current one

2026-09-27 08:21:02 +02:00

tags_controller.go

…

toggle_whitespace_action.go

Re-render the main view without re-focusing the panel beneath it

2026-09-03 21:19:04 +02:00

undo_controller.go

…

vertical_scroll_controller.go

…

view_selection_controller.go

…

workspace_reset_controller.go

…

worktrees_controller.go

…