Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,13 @@ the resolved app appearance automatically.
branches,
tags, stashes, remotes, ordered multi-commit
cherry-pick, merge-mainline cherry-pick/revert, branch/tag/commit comparison,
merge, and a fully keyboard-operable interactive rebase (reorder, reword,
edit/pause-to-amend, squash, fixup, drop, and merge preservation) with
pause/conflict Continue / Abort. The merge editor can suggest a per-hunk AI
resolution (explanation and confidence); it is written only after you accept
or edit each hunk and click Resolve.
merge, plain rebase onto a branch (with a per-repo `--update-refs` choice),
and a fully keyboard-operable interactive rebase (reorder, reword,
edit/pause-to-amend, squash, fixup, drop, merge preservation, and moving
other local branches in the range) with pause/conflict Continue / Abort.
The merge editor can suggest a per-hunk AI resolution (explanation and
confidence); it is written only after you accept or edit each hunk and
click Resolve.
- **Patch interchange** — preview affected paths and validate patch imports
into the working tree, index, or both; import mailboxes with original authors
and Continue / Skip / Abort recovery; verify bundle refs and prerequisites,
Expand Down
12 changes: 12 additions & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -3275,6 +3275,18 @@ upstream update the behind-count and show a toast. Background fetches are
quiet activity-log entries. Git is spawned through `git_command`
(`CREATE_NO_WINDOW`), the same hidden-console path as DAN-83.

**Rebase `--update-refs` (2026-10-19, DAN-88 first slice):** Plain rebase and
the interactive editor can move other local branches whose tips sit in the
rewritten range. The choice is remembered per repo in Strand's own
`strand.rebaseUpdateRefs` (not git's `rebase.updateRefs`, which would change
`git pull --rebase` too) and saved when a rebase starts. The flat
sequence editor overwrites git's todo, so Strand writes the `update-ref`
lines itself, after the last kept commit each branch contained (including
after a reword amend or a squash chain). Preserve-merges leaves git's lines
in place. Git older than 2.38 disables the toggle instead of failing
mid-rebase. Later stack slices (parent branch, sidebar grouping, restack,
stacked PRs) stay open.

**Worktrees UI revision (2026-09-04):** Reworked PR 113's cramped table into
readable two-line rows: branch and directory together, working changes and
latest commit in separate columns, explicit current/locked indicators, and
Expand Down
17 changes: 14 additions & 3 deletions TASKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,10 @@ community plugins, performance and platform certification from Git feature gaps.
- ☑ Merge (ff / no-ff / squash) (`Repo::merge(refname, MergeMode)` — `git merge`
`[--no-ff|--squash] --no-edit`; sidebar branch menu "Merge into <current>" →
`MergeDialog` with the three strategies. Squash leaves the result staged.)
- ☑ Rebase (onto branch, onto commit) (`Repo::rebase(onto)` — `git rebase <onto>`,
any revspec; sidebar branch menu "Rebase <current> onto this", confirm step.)
- ☑ Rebase (onto branch, onto commit) (`Repo::rebase(onto, update_refs)` —
`git rebase [--update-refs|--no-update-refs] <onto>`, any revspec; sidebar
branch menu "Rebase <current> onto this" opens `RebaseOntoDialog`. The
choice is remembered as local `strand.rebaseUpdateRefs` when a rebase starts.)
- ☑ Abort in-progress op (`Repo::abort_operation` — detects rebase / cherry-pick
/ revert / merge from `.git/` markers and runs the matching `--abort`; surfaced
by `RepoMeta.operation` + the in-progress banner and a ⌘K "Abort <op>" action.)
Expand All @@ -394,7 +396,7 @@ community plugins, performance and platform certification from Git feature gaps.
paused rebase only advances this way, not via a commit. Surfaced by the
`OpBanner` "Continue" button, gated until conflicts clear.)
- ☑ Interactive rebase (custom sequence-editor; shells out) — `Repo::rebase_todo`
lists `base..HEAD`; `Repo::interactive_rebase(base, steps)` drives `git rebase
lists `base..HEAD`; `Repo::interactive_rebase(base, steps, preserve_merges, update_refs)` drives `git rebase
-i` with **no editor**: the todo is fed via `GIT_SEQUENCE_EDITOR=cat
"$STRAND_REBASE_PLAN" >`, `GIT_EDITOR=true` keeps squash on git's default
combined message, and `reword` is `pick` + `exec git commit --amend -F <msg>`
Expand All @@ -418,6 +420,15 @@ community plugins, performance and platform certification from Git feature gaps.
- ☑ Interactive rebase: preserve merges (`--rebase-merges`) — enabled by
default for merge ranges; Strand's sequence editor retains Git's generated
label/reset/merge topology while applying pick/reword/edit/drop actions
- ☑ Rebase `--update-refs` (DAN-88 first slice) — flat todos emit
`update-ref refs/heads/<name>` from `plan_update_refs` because
`GIT_SEQUENCE_EDITOR=cat` overwrites git's lines; preserve-merges awk
passes git's lines through. `UpdateRefsToggle` in `RebaseEditor` and
`RebaseOntoDialog` (disabled with a tooltip before Git 2.38). Result
toasts use `withMovedBranches`. Refs move only when the rebase finishes.
- ☐ Stacked branches after `--update-refs` (DAN-88 later slices): record a
parent branch, group them in the sidebar, show restack-needed, and create
a PR for the stack. Not part of the first slice.
- ☑ Cherry-pick / revert a merge commit (validated `-m` support in
`Repo::{cherry_pick,revert}` + keyboard-operable `MainlineDialog`)
- ☑ Submodule init / update / sync (`Repo::submodule_update` — `git submodule
Expand Down
Loading
Loading