Skip to content

test: repoint copy of feat/config#2

Open
dezren39 wants to merge 2 commits into
feat/preflightfrom
feat/worktree-ops
Open

test: repoint copy of feat/config#2
dezren39 wants to merge 2 commits into
feat/preflightfrom
feat/worktree-ops

Conversation

@dezren39
Copy link
Copy Markdown
Owner

@dezren39 dezren39 commented Apr 12, 2026

Branches in other worktrees are no longer skipped during restack/sync/move/commit/amend. Instead, ez detaches the worktree HEAD, rebases the freed branch ref, then reattaches.

Also fixes ez switch to show clear messaging about shell integration and adds --no-cd-required flag for agents/scripts.

Changes

  • detach_worktree_head / reattach_worktree — new git helpers
  • restack, sync, move, commit, amend — detach-rebase-reattach instead of skip
  • ez switch — clear hint about cd <path> and shell integration
  • --no-cd-required — flag for callers handling cd themselves

Commits (2)

  • 98a09b4 feat: restack across worktrees (detach-rebase-reattach) and fix switch messaging
  • f6adc25 test: add no_cd_required switch_to tests and detach/reattach worktree round-trip

Resolves rohoswagger#14
Resolves rohoswagger#15


Stack (this PR is 3 of 5):

  1. feat/config (rohoswagger#9)
  2. feat/preflight (dezren39#1)
  3. → feat/worktree-ops ← you are here (dezren39#2)
  4. feat/fork (dezren39#3)
  5. feat/local-merge (dezren39#4)

…h messaging

Restack/sync/move/commit/amend no longer skip branches in other worktrees. Instead they detach the worktree HEAD, rebase the freed branch ref, then reattach. Also fixes ez switch to show clear messaging about shell integration and adds --no-cd-required flag.
@dezren39 dezren39 force-pushed the feat/worktree-ops branch from 888cbdc to f6adc25 Compare April 13, 2026 00:13
@dezren39 dezren39 changed the title feat: restack across worktrees + fix switch messaging test: repoint copy of feat/config Apr 13, 2026
dezren39 added a commit that referenced this pull request Apr 13, 2026
@dezren39 dezren39 marked this pull request as ready for review April 13, 2026 06:08
rohoswagger added a commit that referenced this pull request May 7, 2026
fix: create worktree when using --from and auto-create on switch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant