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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ the resolved app appearance automatically.
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.
**Amend staged changes into this commit** folds the index into an older
commit on the branch in one confirmed rewrite.
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.
Expand Down
8 changes: 8 additions & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -3149,6 +3149,14 @@ empty state (heading included) and network failures offer Retry. Default
selection is `getVersion()` when that tag is in the list. Auto-popup after
upgrade is out of scope.

**Amend into an older commit (2026-10-19, DAN-92):** The commit graph can fold
the staged index into any earlier commit on the current branch in one action.
Strand commits a fixup and rebases with an oid plan (not `--autosquash`),
autostashes unstaged work, confirms the commits that will be rewritten, refuses
a merge in that range, and warns when the target is already on the upstream.
Abort of a conflicted rewrite restores the original tip. Moving hunks between
existing commits stays a later slice.

## Cross-cutting tracks (run in parallel with all milestones)

**Main hardening audit kick (2026-09-29):** Audited 1.7.2 at `f5ed9a8` after
Expand Down
10 changes: 10 additions & 0 deletions TASKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,16 @@ community plugins, performance and platform certification from Git feature gaps.
oid-prefix target resolution, stacked prefixes stripped, unmatched stay
`pick`) seeds `RebaseEditor.tsx`, which shows an "Autosquash: N fixup
commits moved…" notice; the seeded plan stays fully editable.
- ☑ Amend staged changes into an older commit (DAN-92, first slice). Graph and
commit-detail action "Amend staged changes into this commit" plus palette
"Amend staged changes into selected commit…". `Repo::amend_into_commit`
commits a fixup and runs `interactive_rebase` from an oid plan (fixup step
immediately after the target; `--root` when the target has no parent;
`--autostash` for unstaged work). `Repo::amend_into_plan` lists the rewrite
range, sets `has_merge` so the dialog refuses, and sets `pushed` when the
target is contained in `@{upstream}`. Abort soft-resets to the pre-fixup tip
recorded in `.git/strand-amend-into`. Hunk moves between commits are out of
this slice.
- ☑ Interactive rebase: `edit` (pause-to-amend) action (`RebaseAction::Edit`
leaves Git's rebase markers active; Local Changes amend + OpBanner Continue
completes the plan, with later reword files persisted across the pause)
Expand Down
Loading
Loading